The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

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

Aru Sahni
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
December 2, 2015

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

Ask your question here...

1 answer

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

1 vote
ben-dean-ontsys
August 16, 2016

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.

TAGS
AUG Leaders

Atlassian Community Events