June 8, 2014
9:37 a.m.
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.ht... http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-merge-q... http://differential.io/blog/best-way-to-merge-a-github-pull-request cheers -ben