We got burned few times by this feature to resolve merge conflicts from gitlab UI <https://about.gitlab.com/2016/09/06/resolving-merge-conflicts-from-the-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? -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to gitlabhq+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/gitlabhq/caeb9752-0219-49ec-9ea7-a0aba449db17%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
