Skip to content

Make sure our EE copy is more up-to-date than CE

Lin Jen-Shin requested to merge fetch-ce-first into master

In https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8103 we had a conflict that shouldn't happen because we did merge the EE merge request first: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8099

However it happened. I assume this was because we fetch EE first, and the EE MR wasn't hit onto EE master yet. Then we fetch CE right before we try to merge, which then contained the CE MR!

The window is small but it could still happen.

In order to make sure this won't happen, we could always fetch CE first so EE must be more up-to-date.

Merge request reports