Default commit message in conflict resolution is reversed

Please read this!

Before opening a new issue, make sure to search for keywords in the issues filtered by the "regression" or "bug" label.

For the Community Edition issue tracker:

  • https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=regression
  • https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=bug

For the Enterprise Edition issue tracker:

  • https://gitlab.com/gitlab-org/gitlab-ee/issues?label_name%5B%5D=regression
  • https://gitlab.com/gitlab-org/gitlab-ee/issues?label_name%5B%5D=bug

and verify the issue you're about to submit isn't a duplicate.

Please remove this notice if you're confident your issue isn't a duplicate.


Summary

When merging two branches with conflicts and resolving those conflicts via the merge request edit, the default commit message is reversed. For example, if I am merging "Development" branch into "master", when resolving the conflict, the commit message defaults to "Merge branch 'master' to 'development'. It should say the inverse.

Steps to reproduce

  1. Create two branches and make conflicting changes to each.

  2. Create a merge request to merge branch 1 to branch 2

  3. In the merge request, click resolve conflicts.

  4. The commit message says the inverse of the merge request merge.

Example Project

(If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report)

(If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version)

What is the current bug behavior?

Commit message reverses the order of the branches that are being merged.

What is the expected correct behavior?

The commit message should read the branch being merged and the receiving branch in the correct order.

Relevant logs and/or screenshots

image image

Output of checks

NA

Results of GitLab environment info

ENV GitLab EE 9.3.6

NA

Assignee Loading
Time tracking Loading