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

Re: git merge - "both added" conflict resolution

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Aug 4, 2010, 20:59 UTC
Message-ID
<20100804205916.GC2920@burratino>
In-Reply-To
<AANLkTi=Hp6DsE75XbgehS2bucp-M9NXmGgYbvw0kp6j8@mail.gmail.com>
Hi Eugene,
Eugene Sajine wrote:
[in an add/add conflict]
Show 5 quoted lines
>           when i resolve the conflict the build.xml returns to its
> last committed state of dest repo, so git cannot determine any
> changes.
> Therefore, i cannot execute git add for this file and i cannot commit
> my merge results

Could you explain further (preferrably with a simple example transcript)? I would think that after an add/add conflict, a simple "git add" would mark the file resolved and allow committing.

Previous: Eugene SajineNext: Eugene Sajine
Message 2 of 6 in “git merge - "both added" conflict resolution”
  1. Eugene SajineAug 4, 2010
  2. Jonathan NiederAug 4, 2010
  3. Eugene SajineAug 4, 2010
  4. Jonathan NiederAug 4, 2010
  5. Eugene SajineAug 5, 2010
  6. Eugene SajineAug 6, 2010

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.