Changes between Version 73 and Version 74 of WorkingWithGit

Timestamp:

Jan 30, 2017, 10:02:00 PM (8 years ago)

Author:

ctreleaven (Craig Treleaven)

Comment:

Preliminary notes about using branches

WorkingWithGit

@@ -139 +139 @@
 
 
+=== Using a branch for development === #branch
+
+Commonly, you'd use a local branch for development if you want this work isolated, such as when you are making experimental changes or it may take some time complete the work.
+
+The life cycle for a branch, say "foobar", might look like this:
+{{{
+git branch foobar     # creates a local branch
+git checkout foobar
+}}}
+
+- lots of edits and testing
+
+{{{
+git commit -m "blah blah"
+}}}
+
+
+- more testing and corrections
+
+{{{
+git commit -a --amend -m "revised blah blah"
+}}}
+
+
+- throughout the process, you can 'git checkout master' / 'git checkout foobar' to switch in and out of the branch.
+
+- if there are upstream changes that need to be reflected in your branch...
+
+{{{
+git branch --set-upstream-to=origin/master foobar
+git pull --rebase
+}}}
+
+
+- finally, work is done.  Now merge the changes into your local master...
+
+{{{
+git checkout master
+git merge --ff-only foobar
+}}}
+
+- check that only your expected commits are about to be pushed
+
+{{{
+git log origin/master..foobar
+}}}
+
+
+- normal steps to push
+
+{{{
+git pull --rebase  && git push origin master
+}}}
+
+
+- if we're done with the branch, nuke it
+
+{{{
+git branch -d foobar
+}}}