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: .github/angular-robot.yml
+15-8Lines changed: 15 additions & 8 deletions
Original file line number
Diff line number
Diff line change
@@ -14,8 +14,10 @@ merge:
14
14
failureText: "The following checks are failing:"
15
15
16
16
# comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
17
-
mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
18
-
\nPlease help to unblock it by resolving these conflicts. Thanks!"
17
+
mergeConflictComment: >-
18
+
Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
19
+
20
+
Please help to unblock it by resolving these conflicts. Thanks!
19
21
20
22
# label to monitor
21
23
mergeLabel: "action: merge"
@@ -54,13 +56,18 @@ merge:
54
56
# the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
55
57
# {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
56
58
# {{PLACEHOLDER}} will be replaced by the list of failing checks
57
-
mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
58
-
\n{{PLACEHOLDER}}
59
-
\n
60
-
\n**If you want your PR to be merged, it has to pass all the CI checks.**
61
-
\n
62
-
\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
59
+
mergeRemovedComment: >-
60
+
I see that you just added the `{{MERGE_LABEL}}` label, but the following
61
+
checks are still failing:
63
62
63
+
{{PLACEHOLDER}}
64
+
65
+
**If you want your PR to be merged, it has to pass all the CI checks.**
66
+
67
+
If you can't get the PR to a green state due to flakes or broken master,
68
+
please try rebasing to master and/or restarting the CI job. If that fails
69
+
and you believe that the issue is not due to your change, please contact the
0 commit comments