🔀 Merge vs Rebase

---

🔧 Merge

git checkout main
git merge feature/login

• Preserves full history
• Creates merge commits

---

🔧 Rebase

git checkout feature/login
git rebase main

• Rewrites history
• Produces linear history

---

🧩 Rules of Thumb

• Rebase your own branches
• Merge shared branches
• Never rebase public history