I've just learned about merge=ours in .gitattributes from the Pro Git
I have a file that I always want to resolve by "keep ours". So I created a
.gitattributes file in the directory where the file is found with this
And checked in this file. Then I merged another branch into this one and
the file conflict still showed up.
I'm using git version 1.7.11.msysgit.1
Am I misusing this feature, or is it just not supported in this version?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.