From 5f5b9f8cc4a79d9296b234d2c1d66f589c11474f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 4 Dec 2013 21:25:10 +0100 Subject: [PATCH] describe how to develop multiple features at the same time Signed-off-by: Nico Schottelius --- docs/man/man7/cdist-hacker.text | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/man/man7/cdist-hacker.text b/docs/man/man7/cdist-hacker.text index b147808e..2cbf5a8b 100644 --- a/docs/man/man7/cdist-hacker.text +++ b/docs/man/man7/cdist-hacker.text @@ -134,6 +134,20 @@ git fetch -v origin git merge origin/master -------------------------------------------------------------------------------- +Similar when you want to develop another new feature, you go back +to the master branch and create another branch based on it: + +-------------------------------------------------------------------------------- +# change to master and update to most recent upstream version +git checkout master +git fetch -v origin +git merge origin/master + +git checkout -b another_feature +-------------------------------------------------------------------------------- + +(you can repeat the code above for as many features as you want to develop +in parallel) SEE ALSO