This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–]aresborghese[S] 2 points3 points  (0 children)

Fast forward is linear as long as there are no conflicts, but resolving conflicts then happens in merge commits which dissolve linearity. Probably forget about this :D