diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..f6d746dcd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+lib/sidekiq/version.rb merge=ours