Just a curiosity in the stash UI... if you have a pull request with file conflicts, the instructions it gives you are to manually merge your changes from "topic" to "master" (or whatever... source to target).
I'm wondering why it's that and not the commands to merge from master to topic (or rebase topic on master). The instructions seem to be telling you to bypass the whole PR workflow... eg minimum approvers or reviewers, merge request checks etc.
Wouldn't you want the merge to be done and the reviewers to be able to review the results of the merge? Perhaps also the person(s) who need to do the merge don't have permissions to push directly to the target branch.
