From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 04 Aug 2010 23:36:52 GMT
Subject: Re: git merge - "both added" conflict resolution
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.