diff options
Diffstat (limited to 'doc/source/dev/gitwash/development_workflow.rst')
| -rw-r--r-- | doc/source/dev/gitwash/development_workflow.rst | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/source/dev/gitwash/development_workflow.rst b/doc/source/dev/gitwash/development_workflow.rst index fe98fb64d..cf7c26965 100644 --- a/doc/source/dev/gitwash/development_workflow.rst +++ b/doc/source/dev/gitwash/development_workflow.rst @@ -16,7 +16,8 @@ Basic workflow In short: -1. Start a new *feature branch* for each set of edits that you do. +1. Update your ``master`` branch if it's not up to date. + Then start a new *feature branch* for each set of edits that you do. See :ref:`below <making-a-new-feature-branch>`. Avoid putting new commits in your ``master`` branch. @@ -78,6 +79,11 @@ as clear as possible. Making a new feature branch =========================== +To update your master branch, use:: + + git fetch upstream + git merge upstream/master --ff-only + To create a new branch and check it out, use:: git checkout -b my-new-feature upstream/master |