Add comment with necessary setup

mperham · mperham · commit d0ea8489ff64 · 2024-12-05T08:57:43.000-08:00
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
+# Run "git config --global merge.ours.driver true" to set up
 lib/sidekiq/version.rb merge=ours

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+# Run "git config --global merge.ours.driver true" to set up`
`1`	`2`	`lib/sidekiq/version.rb merge=ours`