2

I have a text file in my repo that, by nature of its content, I want to never be automatically merged. I want it to always (assuming there are changes in both branches) generate <<<<<======>>>>> conflict blocks. I figured there should be way to do this using .gitattributes, got to merge drivers and now a little lost in syntax.

Ilia G
  • 10,043
  • 2
  • 40
  • 59
  • have you looked into the `.gitattributes` file at all? https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html – cpjolicoeur Jul 02 '13 at 15:03

0 Answers0