This question is in reference to Atlassian Documentation: Resolve merge conflicts
Ask your question here...
There is a decent tutorial on resolving merge conflicts in the Mercurial wiki. But the Bitbucket documentation in question really needs to talk about how to do this in Mercurial too.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Still have a question?
Get fast answers from people who know.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.