From: Tim Visher Date: Sun, 28 Dec 2008 17:14:54 GMT Subject: Re: 'Theirs' merge between branches on a binary file. Message-ID: In-Reply-To: <49512E9A.5040902@lsrfire.ath.cx> On Tue, Dec 23, 2008 at 1:31 PM, René Scharfe wrote: > Have you seen msysgit (http://code.google.com/p/msysgit/), the easy > route to git on Windows? It has all you need to check out and compile > the latest version of git. I have seen msysgit. I haven't spent too much time with it mainly because I'm in denial that I have to work with Windows all day at work. I'm going to have to look into it I think when I attempt to get my team onto git in a little less than a month. -- In Christ, Timmy V. http://burningones.com/ http://five.sentenc.es/ - Spend less time on e-mail