A 1-post collection

Git merge vs rebase: Resolving conflict

There are lots of blogs and examples on the Internet explaining and comparing git merge and rebase. In this post I would like to take a closer look at what is actually happening with both methods when there is a conflict that has to be resolved.

Setting up a project with conflict

To make things easier and a little bit funny, let's imagine that Jack and Jane are remotely working together on an assignment to gather facts about Austria, and they created a git project consisting of only one file Austria.txt which lists facts about Austria.

Initial commit includes

Read more »