conord
May 15, 2012, 4:57 p.m.
Should this step be merged with the previous (branch) step. Pointing to the same article.
merge
Merging branches together.
To help learn about branching in Git Jamie Curle made a little guide about branching and merging, http://jamiecurle.co.uk/blog/branching-and-merging-in-git/ Please follow this guide and post your results to your github page. In the comments link to your github page and talk about your experience merging for the first time