How to list merge conflicts on origin that are not on local?

Question

Stash is rejecting my pull request due to merge conflicts. So I create a merge branch, merge destination into the merge branch, (there's nothing to commit), push anyway and open the pull request again. Still rejected for conflicts. I've deleted and recreated 3 times, and getting the same results each time.

git mergetool reports no conflicts on local merge branch.

What can I do to figure out what the conflicts are on the remote?

Answer 1

Normally you don't create a new branch to resolve conflicts. Instead you merge the target branch into your pull requests's branch:

git fetch origin
git checkout my_pr_branch
git merge origin/master
<resolve conflicts and commit the resolution>
git push origin my_pr_branch`

If you keep seeing conflicts at stash – someone else has pushed something new to conflict with you at destination.