These instructions are only for Git. How do I do this with Mercurial?

This question is in reference to Atlassian Documentation: Resolve merge conflicts

Ask your question here...

1 answer

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.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

451 views 6 9
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you