When you encounter a merge conflict with Mercurial, things can get a little disorienting. The following is a practical list of steps to handle a merge conflict without getting lost.
Continue reading →