From: Eugene Sajine <euguess@gmail.com>
Date: Wed, 04 Aug 2010 20:18:30 GMT
Subject: git merge - "both added" conflict resolution
Message-ID: <AANLkTi=Hp6DsE75XbgehS2bucp-M9NXmGgYbvw0kp6j8@mail.gmail.com>

hi,

I'm trying to merge two projects into one. Both are having different
and simple set of files inside, but both have build.xml file.
Let's say i have source repo with master branch and dest repo.

When i'm trying to merge source into dest it all goes well with an
exception of the build.xml file - it has conflict. The conflict is one
liner and is easy to resolve, eventually i want it to be as it was
before the merge.
First of all, after the merge git status gives me message "both added;
build.xml" not both modified, which is understandable, but i have no
clue yet how to work with it;)

Secondly, 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, because git sees it as a partial commit.

Any ideas?

Thanks,
Eugene