havvg's playground

The first part being an introduction to git rebase mechanics, this follow-up drives that introduction into real-world examples.

There are many users out there being scared to use git rebase. To wrap things up, git rebase is not a lion that will hunt you down.

It is a cat, it likes you, until you do something fancy and will hurt you once. You will know how to deal with the situation properly the next time - but give it a try.

This post is about quelling some fears off those users - maybe you are one of them?

In the previous post we set up a project using git-subtree. Unfortunately there may be situations when the merge of the subtree will not make its way into the correct directory.