gitlabhq/gitlabhq — pull request #7280 by cirosantilli (2014-07-09 09:28:06+00:00)
Title: Generate development seed merge conflicts from gitlabhq/testme.

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

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