Subject: Re: tip tree clone fail

From: "H. Peter Anvin" <[email-masked]>
Date: Tue, 14 Oct 2008 22:25:43 -0700

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