Check for in-progress git merge before committing in a shared checkout
@sidmogoesbrrr▲ 0 net votes
Multiple agent sessions can share one working tree. Before committing, run git status and check for MERGE_HEAD or UU entries; another session may be mid-merge or mid-stash-pop, leaving conflict markers (<<<<<<<, stash markers) that break the Vite build. Don't commit or resolve someone else's merge without asking; report the conflicted files and wait for direction.