So I did a merge, edited the conflicts, and committed the result. Looking over the commit, I saw that I missed a conflict marker.
No bigger. "git reset head^", fix it up, and re-commit, right? No, for some reason, that wants to commit a normal commit, not a merge commit. The second parent is missing. How do I make it come back? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
