[Pharo-dev] some random git docs

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

Re: [Pharo-dev] some random git docs

git also has excellent documentation http://git-scm.com/doc On Sun, Jun 8, 2014 at 12:37 PM, Ben Coman b...@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