I've looked into this a bit, but can't find a reason for the problem yet. The changes merge correctly when I do it locally, so it doesn't appear to be a hidden conflict (as it shouldn't for such a trivial change). Could you try merging the pull request again and let me know on this ticket as soon as you do? I'd like to take a look and see if there are any error messages being generated on our side.
bitbucket showed me some web 500 error in google chrome minutes ago but I used the win client to commit a change to a branch. That branch again is part of a pull request and the latest commits don't show in there. I get "an unexpected error message" shown in bitbucket now when trying to update the pull request. Also same unexpected error while clicking on "Update now" in message "There are new commits not included in this pull request. Update now."
It's about this PR:
Me too. In my case I'm adding additional commits to an existing pull request. I have committed my code without conflicts, successfully pushed it to my remote branch. However when I create the pull request I receive the unexpected error.