Skip to content

Generate a deterministic development seed merge conflict from gitlabhq/testme.

Matthias Käppler requested to merge github/fork/cirosantilli/mr-conflict into master

Created by: cirosantilli

It is currently very hard to test merge request conflict status interactively as they are all generated randomly.

This generates one predictable merge request conflict. For it to work, the following two branches have to be added, not merged to gitlabhq/testme: https://github.com/gitlabhq/testme/pull/4 https://github.com/gitlabhq/testme/pull/5

I have tested it with my fork and it worked fine: https://github.com/cirosantilli/testme/tree/conflict1

This is a preparation for: http://feedback.gitlab.com/forums/176466-general/suggestions/5590496-resolve-any-merge-request-conflict-from-the-web-in

BTW: more deterministic dev seed at: https://github.com/gitlabhq/gitlabhq/pull/7211

Merge request reports