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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,771 views 1 5
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