File tree Expand file tree Collapse file tree 1 file changed +9
-9
lines changed Expand file tree Collapse file tree 1 file changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -68,14 +68,14 @@ diff --git a/Gemfile b/Gemfile
6868
6969In general the process is:
70701. Create PRs explaining what you are trying to achieve.
71- 1 . Pin the repositories to each other.
72- 2 . Check they pass (go green).
73- 3 . Await review if appropriate.
74- 4 . Remove the commit from one. We will merge ignoring the failure.
75- 5 . Remove the commit from the other, check it passes with the other commit now on master.
76- 6 . Merge the other.
77- 7 . Rebuild the other master to check it still passes.
78-
79- Steps 4-7 should happen contiguously (e.g. one after another but within a short timespan)
71+ 2 . Pin the repositories to each other.
72+ 3 . Check they pass (go green).
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 master.
76+ 7 . Merge the other.
77+ 8 . Rebuild the other master to check it still passes.
78+
79+ Steps 5-8 should happen contiguously (e.g. one after another but within a short timespan)
8080so that we don't leave a broken master around. It is important to triage that build process
8181and revert if necessary.
You can’t perform that action at this time.
0 commit comments