... | ... | @@ -81,9 +81,9 @@ After your merge request has been reviewed and approved, you can request that it |
|
|
|
|
|
As long as your MR satisfies the following, GitLab will batch your MR with other MRs and attempt to merge into `master`:
|
|
|
|
|
|
* Is assigned to @marge-bot
|
|
|
* Passes CI
|
|
|
* Has no merge conflicts with `master `(see rebasing below)
|
|
|
* the MR is assigned to @marge-bot,
|
|
|
* the MR passes CI
|
|
|
* the MR has no merge conflicts with `master` (see [rebasing](#rebasing)).
|
|
|
|
|
|
Each batch is an MR of its own, which must itself pass CI. You can expect GitLab to merge two or three batches per day.
|
|
|
|
... | ... | |