Changes between Version 5 and Version 6 of Chimera2/git

Timestamp:

May 6, 2013, 11:21:55 AM (13 years ago)

Author:

Conrad Huang

Comment:

--

Chimera2/git

@@ -180 +180 @@
 == Use Feature Branch for Development ==
 
+For longer tasks, it is better to use a ''feature'' branch.  A feature branch is off-shoot of '''develop''' that may be used for development of a new feature; the developer may commit changes as desired on the feature branch without affecting the '''develop''' branch.  Once all the work is completed, the entire set of changes may then be merged back to '''develop''' (or discarded if the feature is not useful).  '''git flow''' has a set of tools for managing feature branches, including creating from and merging back to '''develop'''.
+
+A few notes:
+- '''git flow''', like '''git''', prints out messages about what commands one may want to use later.
+- '''my_new_feature''' is the name of the feature branch.  Any name may be used, although overlap of branch names and file names should be avoided to minimize confusion.
+- '''git flow''' only manages the ''__local__'' repository.  Changes still have to be '''pull'''ed from and '''push'''ed to the remote repository.
+
+{{{#!html
+<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
+<b style="color:#c22;">franklin:myrepo conrad$ pwd</b>
+/usr/local/projects/chimera2/git/myrepo
+<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
+# On branch develop
+nothing to commit (working directory clean)
+<b style="color:#c22;">franklin:myrepo conrad$ git flow feature start my_new_feature</b>
+Switched to a new branch 'feature/my_new_feature'
+
+Summary of actions:
+- A new branch 'feature/my_new_feature' was created, based on 'develop'
+- You are now on branch 'feature/my_new_feature'
+
+Now, start committing on your feature. When done, use:
+
+     git flow feature finish my_new_feature
+
+<b style="color:#c22;">franklin:myrepo conrad$ cat example</b>
+hello chimera2
+<b style="color:#c22;">franklin:myrepo conrad$ echo "completely different" > example</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
+# On branch feature/my_new_feature
+# Changed but not updated:
+#   (use "git add &lt;file&gt;..." to update what will be committed)
+#   (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
+#
+#       modified:   example
+#
+no changes added to commit (use "git add" and/or "git commit -a")
+<b style="color:#c22;">franklin:myrepo conrad$ git add -A</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
+# On branch feature/my_new_feature
+# Changes to be committed:
+#   (use "git reset HEAD &lt;file&gt;..." to unstage)
+#
+#       modified:   example
+#
+<b style="color:#c22;">franklin:myrepo conrad$ git commit -m "half done"</b>
+[feature/my_new_feature 8b5e441] half done
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
+# On branch feature/my_new_feature
+nothing to commit (working directory clean)
+<b style="color:#c22;">franklin:myrepo conrad$ echo "finished product" > example</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git add -A</b>
+<b style="color:#c22;">franklin:myrepo conrad$ git commit -m "my new feature does this"</b>
+[feature/my_new_feature 2171ddf] my new feature does this
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+<b style="color:#c22;">franklin:myrepo conrad$ git flow feature finish my_new_feature</b>
+Switched to branch 'develop'
+Merge made by recursive.
+ example |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Deleted branch feature/my_new_feature (was 2171ddf).
+
+Summary of actions:
+- The feature branch 'feature/my_new_feature' was merged into 'develop'
+- Feature branch 'feature/my_new_feature' has been removed
+- You are now on branch 'develop'
+<b style="color:#c22;">franklin:myrepo conrad$ git push</b>
+Counting objects: 9, done.
+Delta compression using up to 64 threads.
+Compressing objects: 100% (5/5), done.
+Writing objects: 100% (7/7), 627 bytes, done.
+Total 7 (delta 4), reused 0 (delta 0)
+Unpacking objects: 100% (7/7), done.
+To /usr/local/projects/chimera2/git/chimera2.git
+   a3108a9..fb5b90a  develop -> develop
+
+</pre>
+}}}
+
 == Stash Modified Files before Switching Branches ==