$ git rebase --abort No rebase in progress? $ git rebase --continue You must edit all merge conflicts and then mark them as resolved using git add Anyone care to fix it? -- 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
