[Scummvm-devel] On using git correctly: Rebase vs. merge

[Ori Avtalion]

Thanks for the guide, Max.

I don't have much time to write a response, so I'll just link this
chapter on rebasing from the Pro Git book:

http://progit.org/book/ch3-6.html

Beside having pretty graphs, which IMHO are important to understanding
git, it's pretty comprehensive and easy(?) to follow.

I will also repeat my recommendation to read the entire book. It
helped me understand Git when all other guides/tutorials failed.