Re: tip tree clone fail

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Wang Chen
Date: Tuesday, October 14, 2008 - 8:43 pm

H. Peter Anvin said the following on 2008-10-13 23:59:

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.
---
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: tip tree clone fail, Thomas Gleixner, (Fri Oct 10, 1:56 am)
Re: tip tree clone fail, Wang Chen, (Fri Oct 10, 1:57 am)
Re: tip tree clone fail, H. Peter Anvin, (Fri Oct 10, 8:58 am)
Re: tip tree clone fail, Wang Chen, (Sun Oct 12, 4:28 am)
Re: tip tree clone fail, Lars Hjemli, (Sun Oct 12, 5:04 am)
Re: tip tree clone fail, Ingo Molnar, (Sun Oct 12, 5:41 am)
Re: tip tree clone fail, Miklos Vajna, (Sun Oct 12, 5:59 am)
Re: tip tree clone fail, H. Peter Anvin, (Sun Oct 12, 7:14 am)
Re: tip tree clone fail, H. Peter Anvin, (Sun Oct 12, 7:15 am)
Re: tip tree clone fail, Ingo Molnar, (Sun Oct 12, 8:24 am)
Re: tip tree clone fail, Teemu Likonen, (Sun Oct 12, 8:36 am)
Re: tip tree clone fail, Petr Baudis, (Sun Oct 12, 8:39 am)
Re: tip tree clone fail, Ingo Molnar, (Sun Oct 12, 9:59 am)
Re: tip tree clone fail, Jakub Narebski, (Sun Oct 12, 10:37 am)
Re: tip tree clone fail, Shawn O. Pearce, (Sun Oct 12, 10:59 am)
Re: tip tree clone fail, H. Peter Anvin, (Sun Oct 12, 9:07 pm)
Re: tip tree clone fail, H. Peter Anvin, (Sun Oct 12, 9:09 pm)
Re: tip tree clone fail, Wang Chen, (Mon Oct 13, 2:40 am)
Re: tip tree clone fail, H. Peter Anvin, (Mon Oct 13, 8:59 am)
Re: tip tree clone fail, Wang Chen, (Tue Oct 14, 8:43 pm)
Re: tip tree clone fail, H. Peter Anvin, (Tue Oct 14, 10:25 pm)