Resolving conflicts in gitlab UI merges both branches

8 views

Skip to first unread message

Victor Murygin

unread,

Dec 22, 2016, 8:05:32 PM12/22/16

to GitLab

We got burned few times by this feature to resolve merge conflicts from gitlab UI.

1. try to merge master to develop 2. resolve conflicts using this built-in gitlab feature in UI 3. The result is it merges master to develop AND develop into master Nobody wanted to merge develop into master. Why does it merge both ways?

Reply all

Reply to author

Forward

0 new messages