Git rebase vs merge -- when each causes problems

Rebasing shared branches rewrites history, causing force-push nightmares. Merging everywhere creates unreadable history.

Rebase YOUR branch onto main (private). Merge THEIR branch into yours (shared). Never rebase commits on remote branches others use.

Rebase rewrites commit hashes. If others based work on old hashes, history diverges.