Skip to content

Commit 7754e3d

Browse files
committed
Address a few more comments
1 parent d50b403 commit 7754e3d

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

CONTRIBUTING.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Workflow
120120
^^^^^^^^
121121

122122
Now, for the workflow! This is by no means the only way to perform this type of
123-
workflow, but we assume that you wish to handle conflicts as often as possible
123+
workflow, but we assume that you wish to handle conflicts as soon as possible
124124
(so as to keep their total number small).
125125

126126
As time passes, you make some changes to files, and you commit those changes (to
@@ -140,13 +140,15 @@ doing this regularly, you'll want to do it before you initiate a pull request.
140140

141141
$ git checkout main
142142
$ git pull upstream main
143+
$ git push origin main
143144
$ git checkout work
144145
$ git rebase main
145146
$ git push origin work
146147

147-
Note: you may need to force the push of the rebased ``work`` branch to your fork (i.e., `git push -f origin work`).
148+
Note: you may need to force the push of the rebased ``work`` branch to your fork
149+
(i.e., `git push -f origin work`).
148150

149-
In any case, you've performed the final commit to your ``work`` branch, so it's
151+
Once you've performed the final commit to your ``work`` branch it's
150152
time to make a pull request online and wait for our main friends to review and
151153
accept it.
152154

0 commit comments

Comments
 (0)