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

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

Revision: 17d29e90fc67
Author: jeremy.wadsack <jeremy....@gmail.com>
Date: Fri Jan 13 14:07:34 2012
Log: Edited wiki page BranchingAndMerging through web user interface.
http://code.google.com/p/npr-android-app/source/detail?r=17d29e90fc67&repo=wiki

Modified:
/BranchingAndMerging.wiki

=======================================
--- /BranchingAndMerging.wiki Fri Jan 13 14:06:35 2012
+++ /BranchingAndMerging.wiki Fri Jan 13 14:07:34 2012
@@ -35,12 +35,12 @@

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._