How to resolve conflicts through web interface?

Skip Montanaro July 7, 2014

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

0 votes
Skip Montanaro July 15, 2014

Is this functionality not available?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events