From 0dd5a76bcc3da1c3b016a1304bba31c6c55cdeb4 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Sat, 22 Sep 2012 17:28:19 +0200 Subject: DOC: one more edit to the dev-guide. Recommend to update master before creating your feature branch. Thanks to Nicky van Foreest for feedback on the dev-guide. --- doc/source/dev/gitwash/development_workflow.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'doc/source/dev/gitwash/development_workflow.rst') 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 `. 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 -- cgit v1.2.1