Skip to content

Commit 94929b0

Browse files
gonukeabachma2
andauthored
A number of small improvements/clarifications from @abachma2
Co-authored-by: Amanda Bachmann <abachmann@anl.gov> Signed-off-by: Paul Wilson <paul.wilson@wisc.edu>
1 parent 559d351 commit 94929b0

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

CONTRIBUTING.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ your fork of this repository referred to as ``origin``.
109109
First, let's make our ``work`` branch. Assuming that you are in the ``cyclus`` directory:
110110
::
111111
$ git branch work
112+
$ git checkout work
112113
$ git push origin work
113114

114115
We now have the following situation: there exists the mainline copy of the ``main``
@@ -143,15 +144,15 @@ doing this regularly, you'll want to do it before you initiate a pull request.
143144
$ git rebase main
144145
$ git push origin work
145146

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

148149
In any case, you've performed the final commit to your ``work`` branch, so it's
149150
time to make a pull request online and wait for our main friends to review and
150151
accept it.
151152

152153
Sometimes, your pull request will be held by the reviewer until
153154
further changes are made to appease the reviewer's concerns. This may be
154-
frustrating, but please act rationally, discuss the issues on the GitHub space
155+
frustrating, but please act rationally; discuss the issues on the GitHub space
155156
made for your pull request, consult the `style guide
156157
<http://cyclus.github.com/devdoc/style_guide.html>`_, reach out on `slack
157158
<https://cyclus-nuclear.slack.com>`_ for further advice, and make changes to

0 commit comments

Comments
 (0)