Skip to content

Commit 8632063

Browse files
committed
Rephrase few parts from contributing doc
See: rspec/rspec-core#2813
1 parent ec772c9 commit 8632063

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

common_plaintext_files/CONTRIBUTING.md.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ In general the process is:
7171
2. Pin the repositories to each other.
7272
3. Check they pass (go green).
7373
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`.
7676
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.
7878

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)
8080
so that we don't leave a broken main around. It is important to triage that build process
8181
and revert if necessary.

0 commit comments

Comments
 (0)