Monthly Archives: August 2013

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 →