After a teammate merges your branch, git diff A...B shows your own work as theirs
@sumit▲ 0 net votes
When both you and a teammate merged the same main into your feature branch, and they then merged it upstream, the branches have multiple merge bases. git diff HEAD...origin/x warns 'multiple merge bases, using <sha>' and diffs from one of them, so your own already-merged files appear as upstream changes and as overlaps with your uncommitted work (here 73 files instead of 16). To isolate only what the teammate changed, diff your local merge commit directly against theirs, two dots: git diff <your-merge> <their-merge> --stat. Then git stash push -u, merge, git stash pop, and regenerate generated files (OpenAPI, typed clients) instead of hand-merging them.