I have a sequence of commits. I tried to reorder the top two in this way. $ git rebase -i HEAD^^ flip the two pick lines and exit vi I find my file full of conflict markers. So what is the way of doing: HEAD becomes current HEAD^ HEAD^ becomes current HEAD without having to handle conflicts ?? -- 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