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

git rebase conflict help?

From
KGKevin Geiss <kevin@desertsol.com>
Date
Nov 17, 2005, 22:20 UTC
Message-ID
<33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com>

I fetched my origin branch, then tried to run 'git rebase origin'. one of my commits from master which is not yet in origin got a conflict, so git rebase origin told me that the Simple cherry-pick failed, and the Automatic cherry-pick got conflicts. and it saved the commit message for me in .msg and my offending commit's id in .rebase- tmp32409.

I'm not sure how to proceed from here. actually, I know what the offending changes are, and I could re-do the changes by hand and commit them again, but I'd like to know what git tools I'm supposed to use in this case...

thanks.
Next: Junio C Hamano
Message 1 of 3 in “git rebase conflict help?”
  1. Kevin GeissNov 17, 2005
  2. Junio C HamanoNov 17, 2005
  3. Franck Bui-HuuNov 18, 2005

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.