subject:"\[git\-users\] .gitattributes merge=ours doesn't work on msysgit\?"

Re: [git-users] .gitattributes merge=ours doesn't work on msysgit?

2013-02-05 Thread Philip Oakley

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:

[git-users] .gitattributes merge=ours doesn't work on msysgit?

2013-02-05 Thread Andrew Arnott

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: