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

Re: git rebase: unexpected conflict

From
Jakub Narebski <jnareb@gmail.com>
Date
Feb 4, 2007, 19:33 UTC
Message-ID
<eq5cc6$al2$1@sea.gmane.org>
In-Reply-To
<20070204190519.GB29029@mellanox.co.il>
Michael S. Tsirkin wrote:
> git rebase seems to see conflicts where there shouldn't be any.

Were you on a branch that you wanted to rebase? I had made this error once. git rebase --onto <newbase> <upstream> <branch> moves <upstream>..<branch> into <newbase>.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Michael S. TsirkinNext: Michael S. Tsirkin
Message 2 of 16 in “git rebase: unexpected conflict”
  1. Michael S. TsirkinFeb 4, 2007
  2. Jakub NarebskiFeb 4, 2007
  3. Michael S. TsirkinFeb 4, 2007
  4. Junio C HamanoFeb 7, 2007
  5. Michael S. TsirkinFeb 7, 2007
  6. Junio C HamanoFeb 7, 2007
  7. Michael S. TsirkinFeb 7, 2007
  8. Junio C HamanoFeb 7, 2007
  9. Michael S. TsirkinFeb 7, 2007
  10. Junio C HamanoFeb 7, 2007
  11. Michael S. TsirkinFeb 8, 2007
  12. Junio C HamanoFeb 8, 2007
  13. Michael S. TsirkinFeb 8, 2007
  14. Michael S. TsirkinFeb 9, 2007
  15. Linus TorvaldsFeb 7, 2007
  16. Linus TorvaldsFeb 7, 2007

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.