Bits of .NET

History rewritten, chaos.

Why
Force-push on shared branch.

Fix
Only rebase local branches.

---

💥 Git Rebase Broke Everything

History rewritten. Chaos followed.

Git rebase is powerful.
Used incorrectly, it’s destructive.

Most Git disasters don’t come from bugs —
they come from rewriting shared history.

---

🚨 The Core Problem

git rebase rewrites commit history.

That’s fine only if you’re the sole owner of that history.

When you rebase a shared branch (like main, develop, or a team feature branch), Git creates new commits with new hashes.

Everyone else’s local history instantly becomes invalid.

---

💣 What Usually Happens

1. Developer rebases a shared branch

2. Force-pushes (git push --force)

3. Other developers pull

4. Git explodes into:

   • Conflicts everywhere

   • Duplicate commits

   • “Already applied” / “cannot rebase” errors

   • Lost work

From Git’s perspective:

“These commits are not the same commits anymore.”

---

🔥 Real-World Example

Before rebase

A -- B -- C  (shared branch)

Someone rebases and force-pushes

A -- B' -- C'

Same changes.
Different commit hashes.

Everyone else still has:

A -- B -- C

👉 Git sees two parallel realities.

---

❌ The Root Cause

• Rebasing a branch others are using

• Force-pushing rewritten history

• Treating rebase like a safe cleanup tool everywhere

Rebase is not dangerous.
Rebasing shared history is.

---

✅ The Golden Rule

Only rebase local branches.
Never rebase a branch that others have pulled.

---

🟢 Safe Usage Pattern

✔ Rebase your local feature branch

git checkout feature/my-work
git rebase main

Then merge normally:

git checkout main
git merge feature/my-work

No force-push needed.
No history corruption.

---

🛡 If You Must Force-Push

Only acceptable when:

• The branch is private

• No one else has pulled it

• The team explicitly agrees

And even then:

git push --force-with-lease

This prevents overwriting someone else’s unseen work.

---

🧠 Rebase vs Merge (Mental Model)

• Rebase: “Rewrite my story”

• Merge: “Preserve everyone’s story”

Shared branches need history preservation, not rewriting.

---

🧾 TL;DR

❌ Rebase + force-push on shared branch
= 💥 chaos

✅ Rebase only local branches
✅ Merge shared branches
✅ Use --force-with-lease if absolutely necessary

---

Git didn’t break your project.
You just changed the past.