There's a lot of confusion between git merge and git rebase even among seasoned users of git. "An Introduction to Git Merge and Git Rebase: What They Do and When to Use Them" is a great article explaining the pros and cons of each, and when and why using each of this is better. While … Continue reading git merge vs. git rebase