git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: 'Theirs' merge between branches on a binary file.

From
Tim Visher <tim.visher@gmail.com>
Date
Dec 28, 2008, 17:14 UTC
Message-ID
<c115fd3c0812280914p61e3db34vb033f30b1e04da33@mail.gmail.com>
In-Reply-To
<49512E9A.5040902@lsrfire.ath.cx>

On Tue, Dec 23, 2008 at 1:31 PM, René Scharfe <rene.scharfe@lsrfire.ath.cx> 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
Previous: René Scharfe
Message 9 of 9 in “'Theirs' merge between branches on a binary file.”
  1. Tim VisherDec 22, 2008
  2. Junio C HamanoDec 22, 2008
  3. Tim VisherDec 22, 2008
  4. Junio C HamanoDec 22, 2008
  5. Tim VisherDec 22, 2008
  6. Junio C HamanoDec 22, 2008
  7. Tim VisherDec 23, 2008
  8. René ScharfeDec 23, 2008
  9. Tim VisherDec 28, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.