Handle failed merge when branch gets updated

Jacob Vosmaerrequested to merge
user-merge-branch-nil into master

Part of fixing #854 (closed) (needs client side work too).

Edited by Jacob Vosmaer

Merge request reports