You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: resources/auto-merger.md
+11-2Lines changed: 11 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,7 +27,15 @@ Some RAPIDS repositories use an auto-merger to merge pull requests. The auto-mer
27
27
1. Ensures all merged pull requests have consistent and useful commit messages
28
28
2. Allows pull request merges to be scheduled to occur when all merge criteria (below) are satisfied
29
29
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`.
31
39
32
40
If the merge criteria below are satisfied when the comment is left on the pull request, the pull request will merge immediately.
33
41
@@ -37,7 +45,8 @@ If the merge criteria below are **not satisfied** when the comment is left on th
37
45
38
46
- All **required** (not optional) CI checks must be passing
39
47
- 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
41
50
- No changes have been requested from users who have `write`, `admin`, or `owner` permissions
42
51
- Any user who left the `/merge` comment must have `write` or `admin` privileges on the repo
0 commit comments