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

…ion branches
sidekiq · Dec 5, 2024 · b025516 · b025516
1 parent ea02eaa
commit b025516
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+lib/sidekiq/version.rb merge=ours