In Github they make it easy for users to edit and resolve merge conflicts in a file just by editing inline in the

Bitbucket seems to require manually pulling through repo and going through merge resolution steps even for simple merges like just extra sections of code being added from a previously merged pull request .