git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: tip tree clone fail

From
HAH. Peter Anvin <hpa@zytor.com>
Date
Oct 15, 2008, 05:25 UTC
Message-ID
<48F57ED7.1090305@zytor.com>
In-Reply-To
<48F566C4.2050905@cn.fujitsu.com>
Wang Chen wrote:
Show 12 quoted lines
> 
> 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
Previous: Wang ChenNext: H. Peter Anvin
Message 20 of 21 in “Re: tip tree clone fail”
  1. Thomas GleixnerOct 10, 2008
  2. Wang ChenOct 10, 2008
  3. H. Peter AnvinOct 10, 2008
  4. Wang ChenOct 12, 2008
  5. Lars HjemliOct 12, 2008
  6. H. Peter AnvinOct 12, 2008
  7. Ingo MolnarOct 12, 2008
  8. Miklos VajnaOct 12, 2008
  9. H. Peter AnvinOct 12, 2008
  10. Ingo MolnarOct 12, 2008
  11. Teemu LikonenOct 12, 2008
  12. Petr BaudisOct 12, 2008
  13. Ingo MolnarOct 12, 2008
  14. Jakub NarebskiOct 12, 2008
  15. Shawn O. PearceOct 12, 2008
  16. H. Peter AnvinOct 13, 2008
  17. Wang ChenOct 13, 2008
  18. H. Peter AnvinOct 13, 2008
  19. Wang ChenOct 15, 2008
  20. H. Peter AnvinOct 15, 2008
  21. H. Peter AnvinOct 13, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.