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

Re: Sharing merge conflict resolution between multiple developers

From
Christian Couder <christian.couder@gmail.com>
Date
Aug 11, 2014, 18:57 UTC
Message-ID
<CAP8UFD27qHqHx4ZPw=Fyn0R9NWqhuiespDHnDi=z=1nKb=wKtg@mail.gmail.com>
In-Reply-To
<CAP8UFD0_zfB_D-9EVZ4K=Zdq_G+9C-QhX7WED53zExV+Nv8Arg@mail.gmail.com>
Le 11 août 2014 07:50, "Christian Couder" <christian.couder@gmail.com> a écrit :
>
> This should be possible using "git imerge" which is separate tool.

Sorry I sent the above using the gmail app on my mobile phone and unfortunately I can't make it send plain text emails. (Emails which are not plain text are rejected by vger.kernel.org.)

Best, Christian.

Previous: Jason Pyeron
Message 10 of 10 in “Sharing merge conflict resolution between multiple developers”
  1. Chris PackhamAug 11, 2014
  2. Junio C HamanoAug 11, 2014
  3. Chris PackhamAug 11, 2014
  4. Junio C HamanoAug 12, 2014
  5. Nico WilliamsAug 11, 2014
  6. Jeff KingAug 17, 2014
  7. Signinig a commit with multiple signaturesJason Pyeron, Aug 17, 2014
  8. Jeff KingAug 19, 2014
  9. Jason PyeronAug 19, 2014
  10. Christian CouderAug 11, 2014

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.