cms-sw/cms-sw.github.io — pull request #9 by olivito (2014-11-07 13:23:26+00:00)
Title: Update conflict resolution instructions

Adding Andrea Bocci's instructions from this hn thread. They were helpful to me in resolving a conflict and cleaning up the commit history.

https://hypernews.cern.ch/HyperNews/CMS/get/git/195/1.html