Skip to main content

One post tagged with "aha-moment"

View All Tags

Wait, My Main Branch Doesn't Have My Changes? 🤯 Understanding Rebase vs Merge

· 15 min read
Mahmut Salman
Software Developer

The Confusion 😕

Backend Dev: "I just successfully rebased my backend branch onto main with 18 commits. So now my main branch has all my backend changes, right?"

Git Mentor: "Actually... no! Your backend branch is updated, but main still doesn't have your changes!"

Backend Dev: "WHAT?! But I thought rebase puts my commits on top of main? Isn't that the same thing?"

Git Mentor: "Ah! This is one of the most common misunderstandings about Git! Let me show you exactly what happened and why main still doesn't have your changes!"