From: Andrew Arnott
Sent: Saturday, February 02, 2013 6:51 PM
I've just learned about merge=ours in .gitattributes from the Pro Git book. 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 content:


version.txt merge=ours

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?

***
I don't believe that its is curently possible to combine the the features. It has been 'asked for' in different guises a number of times, but I don't think it has been enough of an itch for someone to code, discuss, refactor, and get adopted.
Philip
***

Thanks.
--

--
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 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to