We're having a problem merging pull requests.
If we review and merge the pull request before any other changes are merged onto the branch then the merge works.
However, if there has been any merge to the branch by the core developers (i.e. directly in Git and not through Stash) between the time the pull request was created and the attempted merge occurs, then we get this error message:
"New changes were pushed to master in UTF/utf while the merge was being performed. Please retry the merge."
This message occurs even though there were no files in conflict due to the merges.
The only solution at this point is to stop people merging, and have the person who submitted the pull request delete it and add a new one pull request, then merge it immediately.
This is obviously starting to annoy our contributors.
Stash version is v2.4.2
