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, 23:36 UTC
Message-ID
<20100804233652.GB3595@burratino>
In-Reply-To
<AANLkTi=dScNMsf4XZ+sS8R+424fESyOr6wYO4WamAutj@mail.gmail.com>
Eugene Sajine wrote:
> So, I'm removing all conflict markers and removing the incoming line
> with the property value=projectOne leaving it as projectTwo.
> This effectively means that there is no changes in build.xml for git.
> And I'm stuck because i cannot add file, that is not changed

Sorry I wasn’t clear before. Could you give output from attempting to add the file? It is supposed to work.

Previous: Eugene SajineNext: Eugene Sajine
Message 4 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.