Getting Solid at Git Merge vs. Rebase