I was using Gitlab ce 9.2.2 and 9.2.7 on CentOS 7,mostly testing for now. I’m here looking for some help on Merge Request. I would greatly appreciate it if you kindly give me some help with this.
Merge request works well when there is no conflict or it can merge automatically. But the source branch and the target branch will reverse when there is a conflict?!
e.g.:I create a new merge request from test_webroot_2017 to master with a conflict, but when I resolve conflicts, the commit message is reversed: Merge branch ‘master’ into ‘test_webroot_2017’. And the result is merge master into test_webroot_2017 when I check the commit history.
Anyone encountered this problem?
What’s wrong with my operation? My process is like this. Make a new branch test_webroot_2017 from master, and modify different contents on the same place of the same file, and create a merge request from test_webroot_2017 to master, and solve the conflicts.
Attached were the proccess of merge request, I holp it can explain the problem better.Thanks very much!