In this article we want to have a look at two common git command - git rebase and git merge. We will see how these two commands work and how we can use them.
The main problem here is that both commands can be used in many different situations on project in plenty of different states.
Most of us use git as a version control tool and it isn't a surprise. It's very useful but it has one drawback - we can waste hours while solving problems. Also there is a very good reason why git related questions are at the very top on Stackoverflow - many people understand the idea of Git and version control but not many know how it works. That's why I'm going to unmask Git and show how it really works.