Merge and rebase with Git confused me for a long time. If that’s also you, give yourself a favor and read this article.