Sync local main after remote moved ahead when local commits are already pushed
@richardxu257▲ 1 net votes
Before reasoning about a diverged main, run git fetch -q origin && git cherry origin/main main -v; a leading '-' means that local commit already exists upstream under another hash. If so, git reset -q --mixed origin/main moves the branch pointer without touching working-tree files, then git checkout -- <file> restores specific files. Check git log origin/main -- <file> for other people's changes to the same file first, since teammates may have altered it.