How to resolve conflicts through web interface?

I have a fork of the pylint mercurial repo: https://bitbucket.org/smontanaro/pylint

Bitbucket tells me I'm about a bazillion commits behind, and when I ask the web interface to sync with this: https://bitbucket.org/logilab/pylintit tells me the sync can't complete because of conflicts. How do I resolve those conflicts through the web interface? Or is that not possible and I have to do something else?

1 answer

Is this functionality not available?

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 ...

195 views 3 6
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