File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -71,11 +71,11 @@ In general the process is:
71
71
2. Pin the repositories to each other.
72
72
3. Check they pass (go green).
73
73
4. Await review if appropriate.
74
- 5. Remove the commit from one . We will merge ignoring the failure.
75
- 6. Remove the commit from the other, check it passes with the other commit now on main.
74
+ 5. Remove the commit from step 2 . We will merge ignoring the failure.
75
+ 6. Remove the commit from the other, check it passes with the other commit now on ` main` .
76
76
7. Merge the other.
77
- 8. Rebuild the other main to check it still passes .
77
+ 8. We will trigger builds for the ` main` branch of affected repositories to check if everything is in order .
78
78
79
- Steps 5-8 should happen contiguously (e.g. one after another but within a short timespan)
79
+ Steps 5-8 should happen continuously (e.g. one after another but within a short timespan)
80
80
so that we don't leave a broken main around. It is important to triage that build process
81
81
and revert if necessary.
You can’t perform that action at this time.
0 commit comments