From: Stephen Bash <bash@genarts.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: "Temporary merge branch 2" Conflicts
Date: Mon, 20 Aug 2012 09:21:41 -0400 (EDT) [thread overview]
Message-ID: <1666100271.191032.1345468901838.JavaMail.root@genarts.com> (raw)
In-Reply-To: <7vfw7lteaw.fsf@alter.siamese.dyndns.org>
----- Original Message -----
> From: "Junio C Hamano" <gitster@pobox.com>
> Sent: Friday, August 17, 2012 5:10:47 PM
> Subject: Re: "Temporary merge branch 2" Conflicts
>
> Stephen Bash <bash@genarts.com> writes:
>
> > What is the recommended method for resolving this sort of merge?
> > kdiff3 obviously doesn't understand the situation. Do the working
> > tree files contain all the conflicts? If so, I can just go
> > through by hand and resolve the conflicts the old fashion way.
>
> Yes. External tools like kdiff3 may not understand the conflict in
> the working tree, but the files in the working tree should have
> resolved the naturally resolvable bits and only left the conflicted
> bits conflicted. Just resolve manually if you can, and then look at
> what both branches wanted to do to the file ("git log -p --merge
> $that_path" before you "git add" as the final sanity check would
> work nicely) to make sure your resolution makes sense.
Thanks for the clarification Junio. I'll take another swipe at it this week now that I know what I'm doing!
Stephen
prev parent reply other threads:[~2012-08-20 13:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <73388252.160741.1345208957127.JavaMail.root@genarts.com>
2012-08-17 13:48 ` "Temporary merge branch 2" Conflicts Stephen Bash
2012-08-17 20:56 ` Stephen Bash
2012-08-17 21:10 ` Junio C Hamano
2012-08-20 13:21 ` Stephen Bash [this message]
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=1666100271.191032.1345468901838.JavaMail.root@genarts.com \
--to=bash@genarts.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).