From: H. Peter Anvin <hpa@zytor.com>
Date: Wed, 15 Oct 2008 05:25:43 GMT
Subject: Re: tip tree clone fail
Message-ID: <48F57ED7.1090305@zytor.com>
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