From: Tim Visher <tim.visher@gmail.com>
Date: Mon, 22 Dec 2008 20:56:31 GMT
Subject: 'Theirs' merge between branches on a binary file.
Message-ID: <c115fd3c0812221256l494bb824ga8e1640efb07b20c@mail.gmail.com>

Hello Everyone,

I have a binary file that is coming up with a merge conflict
(obviously) between two branches and I want to simply say, 'take their
version of the file'.  Is this possible?  In subversion it's a pretty
trivial merge operation, so I assume there's something similar in git.

Thanks in advance!

-- 

In Christ,

Timmy V.

http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail