From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 04 Aug 2010 20:59:16 GMT
Subject: Re: git merge - "both added" conflict resolution
Message-ID: <20100804205916.GC2920@burratino>
In-Reply-To: <AANLkTi=Hp6DsE75XbgehS2bucp-M9NXmGgYbvw0kp6j8@mail.gmail.com>

Hi Eugene,

Eugene Sajine wrote:

[in an add/add conflict]
>           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.