Really nice illustrations. Definitely going to use this when bringing newcomers up to speed on Git.
Only niggle is that rebasing will give you exactly the same conflicts as a merge would have.
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Really nice illustrations.
Definitely going to use this when bringing newcomers up to speed on Git.
Only niggle is that rebasing will give you exactly the same conflicts as a merge would have.