On Sun, 26 Apr 2015, Alex Pilon wrote:
> On Sun, Apr 26, 2015 at 05:19:00AM -0400, Robert P. J. Day wrote:
> > i'm well aware of the standard behaviour of a FF merge in git, but
> > i'm looking at a git book
>
> Published… or are you under an NDA?
>
> > which shows a figure purporting to show a FF merge and it confuses
> > the heck out of me.
>
> It may be a stupid question… are you sure it's the right figure?
> Some typographical software sometimes confusingly pushes figures
> down, to ‘make everything fit’ optimally.
>
> Without context, which you may not be in a position to provide, it's
> hard to guess what's going on below, since we only have one figure
> and your interpretation thereof.
ok, i took a screenshot of the salient part of the figure and
attached it, reduced quality enough to get it past the ML filters, so
tell me what you think about what that graphic is saying.
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================