Why you should always rebase your feature branches

The question always comes up, especially with the newer developers, should I run git rebase or git merge? Easy answer… Always Rebase feature branches. Merges can cause problems! What problems? Well, you just wrote great code, but your release branch is now trying to overwrite that with a merge, and unless it hits a conflict,…