git also has excellent documentation http://git-scm.com/doc On Sun, Jun 8, 2014 at 12:37 PM, Ben Coman <btc@openinworld.com> wrote:
I am using git for the first time (for documentation) and was trying to understand the options for merging and conflict handling, and found some stuff I thought might be generally useful to others - in particular what "rebasing" was and when it might be appropriate - which I didn't have a clue before. So here they are...
http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html
http://softwareswirl.blogspot.com.au/2009/04/truce-in-merge- vs-rebase-war.html
http://stackoverflow.com/questions/457927/git-workflow- and-rebase-vs-merge-questions
http://differential.io/blog/best-way-to-merge-a-github-pull-request
cheers -ben