i'm well aware of the standard behaviour of a FF merge in git, but
i'm looking at a git book which shows a figure purporting to show a FF
merge and it confuses the heck out of me. the figure shows this (using
different colours to show commits on different branches):
Y1 -- Y2 -- Y3 (branches before merging)
/
... -- X -- X1 -- X2
and the alleged result of a FF merge:
... -- X -- X1 -- X2 -- Y1 -- Y2 -- Y3
i'm confused -- i thought a FF merge was applicable *only* if, after
branching, you did no further work on the main branch. the above
clearly shows that further commits took place on the "master" branch,
and then the branch commits were simply repositioned back to the
master branch, which makes no sense to me.
does anyone know what the above might be referring to?
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================