[wiki.npr-android-app] push by - Created wiki page through web user interface. on 2012-01-13 22:06 GMT

[npr-and...@googlecode.com]

Revision: 8dbd84dfaa0d
Author: jeremy.wadsack <jeremy....@gmail.com>
Date: Fri Jan 13 14:06:35 2012
Log: Created wiki page through web user interface.
http://code.google.com/p/npr-android-app/source/detail?r=8dbd84dfaa0d&repo=wiki

Added:
/BranchingAndMerging.wiki

=======================================
--- /dev/null
+++ /BranchingAndMerging.wiki Fri Jan 13 14:06:35 2012
@@ -0,0 +1,78 @@
+When working with the npr-android-app code you should create a branch for
a feature and someone else should merge it. It's considered bad form to
merge your own code and it should be reviewed before it's committed to
master.
+
+== Starting a feature ==
+When you start work on a feature, create a branch:
+
+{{{
+git checkout -b feature-name
+}}}
+
+== Finishing a feature ==
+
+When it is ready for merging:
+
+ # Mark the story as "Fixed" in the Issues list
+
+ # Attach a link to your remote branch with your changes and notify the
list. Once the branch has been reviewed and any changes made that are
necessary, it is ready to be merged into the master branch.
+
+== Merging a branch and delivering the issue ==
+
+To merge someone's branch:
+
+=== Fetch the code ===
+
+{{{
+git fetch
+}}}
+
+=== Perform the merge ===
+
+*make sure you have no unstaged changes before proceeding*
+
+{{{
+git status
+}}}
+
+When merging into master, use a non-fast-forward merge:
+
+[[[
+git checkout master
+git reset --hard origin/master
+git clean -f
+git merge origin/feature-name --no-ff
+]]]
+
+_At this point you may need to fix any merge conflicts._
+
+=== Validate the code ===
+
+Next, make sure that all is well by running the specs
+
+{{{
+rake validate
+}}}
+
+
+=== Push the code ===
+
+And push to github:
+
+{{{
+git push origin master
+}}}
+
+=== Mark this in the issue ===
+
+Now, very important: Go get the issue tracker and add
comment "Commit: ..." with a link to the commit.
+
+Then mark the story as "fixed"
+
+=== Cleaning up ===
+
+Story owner should approve the story then you can delete the feature
branch.
+
+Deleting a remote branch:
+
+{{{
+git push origin :feature-branch
+}}}

[Jeremy Wadsack]

Justin - 

I drafted a "git flow" process based on how we're doing our work with GitHub (and similar to how many other teams work). Without support for pull requests, the process is a little more complicated on Google Code so I adapted. 

Please read through this and modify as you see fit. I just wanted to get a baseline process document started.

Jeremy Wadsack