From: Eugene Sajine <euguess@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge - "both added" conflict resolution
Date: Thu, 5 Aug 2010 10:41:03 -0400 [thread overview]
Message-ID: <AANLkTimJmHwzDQL00=Mbo2ENR1beRB=P0WKU4S7fRctQ@mail.gmail.com> (raw)
In-Reply-To: <20100804233652.GB3595@burratino>
On Wed, Aug 4, 2010 at 7:36 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> 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.
>
There is no output after I add build.xml with resolved conflicts. When
i do git status build.xml doesn't show up there.
I tried another way:
After i have a conflict i add the build.xml withtout resolving
conflicts. Then I unstage it - it's status changes from "both added: "
to "modified"
Then i can resolve the conflict, which means build.xml returns to it's
last committed state. But then i'm back to square one as build.xml is
not showing in changes, so i cannot add it and i still cannot commit
because of partial commit.
Thanks,
Eugene
next prev parent reply other threads:[~2010-08-05 14:45 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
2010-08-04 23:29 ` Eugene Sajine
2010-08-04 23:36 ` Jonathan Nieder
2010-08-05 14:41 ` Eugene Sajine [this message]
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='AANLkTimJmHwzDQL00=Mbo2ENR1beRB=P0WKU4S7fRctQ@mail.gmail.com' \
--to=euguess@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/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).