Git is the ultimate tool for developers. Yet, branching strategies still confuse many of us.
Commands like merge, rebase, and cherry-pick manipulate your commit history in completely different ways. If you just guess what they do, you risk ruining your team's shared history or losing track of your changes.
The easiest way to understand Git is to visualize it. Let us look at exactly what happens to your Git graph when you run these three critical commands.
Imagine we have a standard repository. We branched off the main branch from commit B to work on a new feature in a feature branch.
While we worked on our feature, someone else pushed commit C and D to main.
