From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: Re: Problem merging
Date: Tue, 22 Nov 2005 19:06:03 -0800 [thread overview]
Message-ID: <7v4q6483ms.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20051123025001.15527.qmail@web31812.mail.mud.yahoo.com> (Luben Tuikov's message of "Tue, 22 Nov 2005 18:50:01 -0800 (PST)")
Luben Tuikov <ltuikov@yahoo.com> writes:
> Trying to merge 4b4a27dff4e2d4cc2eac1cde31aede834a966a48 into
> e1ef47b54d7e7e477f7f1eb3251a9d37f38e0469 using 989e4d6cbc69191c41ddf4b1c492457410376b43.
> Simple merge failed, trying Automatic merge
> Removing include/asm-um/ldt.h
> fatal: merge program failed
> Automatic merge failed, fix up by hand
>
> This is with git HEAD:
> 2392ee98eb76aa821de53c93c9e36acb18d27fc0 -- latest as
> of now.
>
> Is this a bug in git? Since this process has always worked
> before.
As "Merging two branches" section in Documentation/tutorial.txt
shows, it is one of the valid outcome from merge to leave
conflicts and have you manually resolve. So this process
probably is working correctly for you this time as well.
Sorry, but I am not a good enough cryptoanalyst to reverse SHA1
hashes, and I cannot tell if the merge you did *should* have
resulted in the conflict or not, just by looking at the three
commit object IDs.
What does "git diff" and "git diff HEAD" tell you after the
merge procedure leaves conflict in the working tree (branchB
directory, I mean)?
next prev parent reply other threads:[~2005-11-23 3:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-23 2:50 Problem merging Luben Tuikov
2005-11-23 3:06 ` Junio C Hamano [this message]
2005-11-23 3:41 ` Luben Tuikov
2005-11-23 14:49 ` Johannes Schindelin
2005-11-24 10:54 ` Ben Clifford
2005-11-25 1:13 ` Johannes Schindelin
2005-11-25 1:35 ` Andreas Ericsson
2005-11-27 21:24 ` H. Peter Anvin
2005-11-23 8:59 ` Fredrik Kuivinen
2005-11-23 19:48 ` Junio C Hamano
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=7v4q6483ms.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--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).