Automatic Todo for merge request with conflicts

~"feature proposal"

Description

Consider the following situation

  • User A create a merge request and verifies that CI builds are passing and the MR is ready to merge automatically
  • User B changes the same code as User A
  • Now the merge request shows This merge request contains merge conflicts. Please resolve these conflicts or merge this request manually. and can't be merged automatically.

I often have the situation where I want to merge a merge request which now contains conflicts so I inform the owner and wait for him to resolve the conflicts. If the contributor would be aware that his merge conflict contains he could already have resolved these conflicts.

Proposal

It would be great if gitlab would check all open merge request after someone pushes to the target branch (maybe in a background job) and create todos for the owner of conflicted merge request Your merge request !1234 contains merge conflicts

Edited Sep 02, 2020 by 🤖 GitLab Bot 🤖
Assignee Loading
Time tracking Loading