Git with Rebase

You can use rebase to merge and get around conflicts in Git.  Here's an  that points out the issues with thie, meaning it's not a magic bullet.