Skip to content

Commit d1a95b9

Browse files
authored
25.12 updated Maintainer Docs - Auto Merger (#719)
* 25.12 updated Maintainer Docs - Auto Merger * added some additional verbiage to the label checker section
1 parent 7add5c2 commit d1a95b9

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

resources/auto-merger.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,15 @@ Some RAPIDS repositories use an auto-merger to merge pull requests. The auto-mer
2727
1. Ensures all merged pull requests have consistent and useful commit messages
2828
2. Allows pull request merges to be scheduled to occur when all merge criteria (below) are satisfied
2929

30-
To use the auto-merger, simply type `/merge` as a comment on a given pull request. The auto-merger will not run if the comment includes any other text besides `/merge`.
30+
To use the auto-merger, simply type `/merge` as a comment on a given pull request.
31+
32+
There was a secondary use case used when PRs are merged from a `release` branch back into `main`.
33+
34+
Sometimes these requests have merge conflicts that need to be resolved and we do `NOT` want the commits to be squashed.
35+
36+
In order to facilitate this use case the `/merge nosquash` comment has been implemented.
37+
38+
*NOTE* The auto-merger will not run if the comment includes any other text besides `/merge` or `/merge nosquash`.
3139

3240
If the merge criteria below are satisfied when the comment is left on the pull request, the pull request will merge immediately.
3341

@@ -37,7 +45,8 @@ If the merge criteria below are **not satisfied** when the comment is left on th
3745

3846
- All **required** (not optional) CI checks must be passing
3947
- Must not have merge conflicts
40-
- Must not be merging to the `main` branch
48+
- `Branch Checker` Ensures the base branch is under active development
49+
- [Label Checker]({% link resources/label-checker.md %}) Ensures the correct labels have been applied
4150
- No changes have been requested from users who have `write`, `admin`, or `owner` permissions
4251
- Any user who left the `/merge` comment must have `write` or `admin` privileges on the repo
4352

0 commit comments

Comments
 (0)