Git Merge vs Rebase

You are working on a new feature in your project? Chances are that you created a separate branch for that purpose. But what if you want to add these changes to the master branch? Then merge or rebase can be helpful, so let's have a look at these commands!