From: "H. Peter Anvin" <hpa@zytor.com>
To: Wang Chen <wangchen@cn.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>, Petr Baudis <pasky@suse.cz>,
Thomas Gleixner <tglx@linutronix.de>,
FNST-Lai Jiangshan <laijs@cn.fujitsu.com>,
FJ-KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: tip tree clone fail
Date: Tue, 14 Oct 2008 22:25:43 -0700 [thread overview]
Message-ID: <48F57ED7.1090305@zytor.com> (raw)
In-Reply-To: <48F566C4.2050905@cn.fujitsu.com>
Wang Chen wrote:
>
> Yes. My clone is successful. Thanks, Peter.
> But, after cloning, git-pull failed because of conflict.
> I think maybe because Ingo rebased his tree?
> ---
> Auto-merged init/main.c
> CONFLICT (content): Merge conflict in init/main.c
> Auto-merged scripts/bootgraph.pl
> CONFLICT (add/add): Merge conflict in scripts/bootgraph.pl
> Removed sound/soc/at91/eti_b1_wm8731.c
> Automatic merge failed; fix conflicts and then commit the result.
> ---
Yes, the master branch on tip is not rebase-free.
-hpa
next prev parent reply other threads:[~2008-10-15 5:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <48EEA714.4010205@cn.fujitsu.com>
[not found] ` <20081010072951.GB16016@elte.hu>
[not found] ` <20081010083720.GA32069@elte.hu>
[not found] ` <alpine.LFD.2.00.0810101040200.3271@apollo>
[not found] ` <48EF14FC.1000801@cn.fujitsu.com>
2008-10-10 8:56 ` tip tree clone fail Thomas Gleixner
2008-10-10 8:57 ` Wang Chen
2008-10-10 15:58 ` H. Peter Anvin
2008-10-12 11:28 ` Wang Chen
2008-10-12 12:04 ` Lars Hjemli
2008-10-12 14:15 ` H. Peter Anvin
2008-10-12 12:41 ` Ingo Molnar
2008-10-12 12:59 ` Miklos Vajna
2008-10-12 14:14 ` H. Peter Anvin
2008-10-12 15:24 ` Ingo Molnar
2008-10-12 15:36 ` Teemu Likonen
2008-10-12 15:39 ` Petr Baudis
2008-10-12 16:59 ` Ingo Molnar
2008-10-12 17:37 ` Jakub Narebski
2008-10-12 17:59 ` Shawn O. Pearce
2008-10-13 4:09 ` H. Peter Anvin
2008-10-13 9:40 ` Wang Chen
2008-10-13 15:59 ` H. Peter Anvin
2008-10-15 3:43 ` Wang Chen
2008-10-15 5:25 ` H. Peter Anvin [this message]
2008-10-13 4:07 ` H. Peter Anvin
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=48F57ED7.1090305@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=laijs@cn.fujitsu.com \
--cc=mingo@elte.hu \
--cc=pasky@suse.cz \
--cc=tglx@linutronix.de \
--cc=wangchen@cn.fujitsu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.