Ramkumar Ramachandra wrote: > I'm curious: doesn't this also apply to "rebase -i" and other scripts > that attempt to remove the branch state through "reset"? It starts by detaching HEAD. So, just like after a conflicted "git merge", I think typically it will write error: you need to resolve your current index first But that doesn't help when there are no unmerged index entries; good catch. Maybe merge_working_tree() should ask the sequencer API whether there is something untoward in progress so "git checkout" without "-f" can know to bail out. -- 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