On 01/31/2012 05:56 PM, Felipe Contreras wrote: > The rebase will finish, but there will be a .git/CHERRY_PICK_HEAD file. > Ah, good catch. I can reproduce the issue. This is only happening in "rebase -i" because interactive rebase relies on cherry-pick, but not regular rebase. And now cherry-pick creates a state when there's a conflict (since 1.7.5?), which "rebase -i" didn't expect before. We probably just need to do a manual clean up before "rebase -i" continues. I'll try to come up with a patch for this. In the mean time, doing a "git reset" will remove that dangling file. Of course, you could always manually remove it. Does the dangling file cause a subsequent git command to fail? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html