[BUG] MergeRequest : Automerge status not updated after a merge
Created by: ylemoigne
Hi,
Using gitlab 1.9, I felt into a strange behavior, I'm not sure this is a bug, but it seems to.
-Step to reproduce --On GIT Create a local branch A from remote master and checkout. Made change to a file Commit and push to a new upstream branch. Create a local branch B from remote master and checkout. Made a conflicting change Commit and push to a new upstream branch.
--On GitLab Create a merge request #1 (closed) A->Master Create a merge request #2 (closed) B->Master Look at the 2 MR with Master user. On both, auto merge is OK. Use auto merge MR #1 (closed). [With branch delete checked]
View MR#2
-Results MR#2 is still OK for auto merge. What the result will be, there is conflict between master HEAD and B branch's HEAD.
-Expected results MR#2 should need manual merge.
-Note At this step, If I recreate an MR B->master, It require manual merge. If the branch delete is not checked, the status show OK for automerge, but cliking on it has no effect. If branch delete is checked, the merge fail, but the branch is deleted !!