From: Jonathan Nieder <jrnieder@gmail.com>
To: Eugene Sajine <euguess@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge - "both added" conflict resolution
Date: Wed, 4 Aug 2010 15:59:16 -0500 [thread overview]
Message-ID: <20100804205916.GC2920@burratino> (raw)
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.
next prev parent reply other threads:[~2010-08-04 21:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-04 20:18 git merge - "both added" conflict resolution Eugene Sajine
2010-08-04 20:59 ` Jonathan Nieder [this message]
2010-08-04 23:29 ` Eugene Sajine
2010-08-04 23:36 ` Jonathan Nieder
2010-08-05 14:41 ` Eugene Sajine
2010-08-06 14:57 ` Eugene Sajine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100804205916.GC2920@burratino \
--to=jrnieder@gmail.com \
--cc=euguess@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).