Skip to content

Commit 882625f

Browse files
committed
Add .gitattributes to prevent overwriting of the Readme file
when merging hotfix branches to develop From: http://www.alberts.me/post/always-keep-your-copy-of-a-particular-file-in-a-git-merge/ git config merge.ours.name '"always keep ours" merge driver' git config merge.ours.driver 'touch %A' echo "README.rst merge=ours" >> .gitattributes git add .gitattributes git commit -m "keep my copy of the README.rst file"
1 parent 74c2e34 commit 882625f

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
README.rst merge=ours

0 commit comments

Comments
 (0)