-
Recent Posts
Archives
- July 2016
- April 2015
- January 2015
- October 2014
- September 2014
- July 2014
- June 2014
- May 2014
- April 2014
- March 2014
- January 2014
- August 2013
- March 2013
- February 2013
- January 2013
- December 2012
- June 2012
- April 2012
- March 2012
- November 2011
- October 2011
- September 2011
- August 2011
- July 2011
- June 2011
- May 2011
- April 2011
- March 2011
- February 2011
- January 2011
Categories
Blogroll
Meta
Monthly Archives: August 2013
Working with master and project branches in Git
Bringing project work into the main branch $ git checkout master $ git merge projectbranchfrommaster If there are merge conflicts, you will need to resolve them and commit the changes. x <- merge commit | \ x o <- commit on main branch … Continue reading
Posted in Version Control
Leave a comment
