From: Junio C Hamano <junkio@cox.net>
To: Len Brown <len.brown@intel.com>
Cc: git@vger.kernel.org
Subject: Re: Automatic merge failed, fix up by hand
Date: Tue, 23 Aug 2005 15:06:25 -0700 [thread overview]
Message-ID: <7vhddgnw9q.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <1124831571.13042.27.camel@firebird.lenb.worldpath.net> (Len Brown's message of "Tue, 23 Aug 2005 17:12:51 -0400")
Len Brown <len.brown@intel.com> writes:
> The merge issue below is reproduced in a "git clone -l" copy
> with no plain files present.
Meaning you did not have any file in the working tree? It seems
to me that what is happenning is the resolve is trying to merge
the head of your tree and from-linus, but at the same time it
notices that you removed those files from your working tree and
thinks that is what you would want to do.
I could get to 81065e2f415af6... commit (Linus tip at this
moment), so if you can tell me where to snarf the other commit
(702c7e76....) that would help me diagnose the problem a lot.
Thanks.
next prev parent reply other threads:[~2005-08-23 22:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-23 21:12 Automatic merge failed, fix up by hand Len Brown
2005-08-23 22:06 ` Junio C Hamano [this message]
2005-08-23 22:31 ` Len Brown
2005-08-23 23:58 ` Junio C Hamano
2005-08-24 0:29 ` Junio C Hamano
2005-08-24 1:07 ` Junio C Hamano
2005-08-24 1:28 ` Linus Torvalds
2005-08-24 3:52 ` Junio C Hamano
2005-08-24 2:25 ` Len Brown
2005-08-24 3:11 ` Daniel Barkalow
2005-08-24 0:31 ` Len Brown
2005-08-24 0:48 ` Linus Torvalds
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=7vhddgnw9q.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=len.brown@intel.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).