Add merge strategy to avoid version.rb conflicts on long-running version branches

mperham · mperham · commit b0255162bd47 · 2024-12-05T08:53:13.000-08:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+lib/sidekiq/version.rb merge=ours
