... | ... | @@ -26,7 +26,7 @@ TODO: This workflow is not fully finalized |
|
|
* ~"MR::2-under review" label is set by the developer that performed the triage.
|
|
|
1. **Technical review** reviewers will evaluate the concept and implementation of the patch and work with the contributor (that's you) to iterate as necessary. Reviewers can use the “Approve” button to indicate they are happy with the MR.
|
|
|
* ~"MR::3-ready for merge" label is set by the contributor (that's you) once reviewers and contributor are satisfied with the MR.
|
|
|
1. **Final Review** a maintainer will have a final look at the MR (TODO link needed) and add the MR to the merge queue (currently by [assigning to @marge-bot](#merging-your-merge-request)).
|
|
|
1. **Final Review** a maintainer will have a final look at the MR (TODO link needed) and add the MR to the merge queue.
|
|
|
* ~"MR::4-in merge queue" label is set by the maintainer.
|
|
|
1. **Post-merge cleanup** the contributor (that's you) should close and/or have a final look over the any related issues.
|
|
|
|
... | ... | @@ -43,13 +43,11 @@ As long as your MR satisfies the following, marge will batch your MR with other |
|
|
* Passing CI
|
|
|
* Has no merge conflicts with `master `(see rebasing below)
|
|
|
|
|
|
Each batch is an MR and must pass CI, so you can expect Marge to merge 2 or 3 batches per day. She will usually comment on your MR to inform you of progress, but you can also view the status of Marge's batches/MRs [on GitLab](https://gitlab.haskell.org/ghc/ghc/merge_requests?scope=all&utf8=%E2%9C%93&state=all&author_username=marge-bot).
|
|
|
Each batch is an MR and must pass CI, so you can expect GitLab to merge two or three batches per day.
|
|
|
|
|
|
### Rebasing
|
|
|
|
|
|
You generally do NOT need to rebase your MRs unless there are merge conflicts with `master`. Marge will automatically rebase ontop of `master` when batching MRs.
|
|
|
|
|
|
Note GitLab usually complains that "Fast-forward merge is not possible" on your MR. If you see a green check and green "Rebase" button then there are no merge conflicts and *no* action is necessary. If instead you see an exclamation mark and disabled "Merge" button, you must rebase manually and fix any merge conflicts.
|
|
|
You generally do NOT need to rebase your MRs unless there are merge conflicts with `master`. Marge will automatically rebase on top of `master` when batching MRs.
|
|
|
|
|
|
## Opening a merge request
|
|
|
|
... | ... | |