staging

Resolving Git Conflicts Without Overwriting Staged Work

Treat the Git index as protected state: inspect unmerged stages, resolve only the conflicted path, and prove that unrelated staged work remains unchanged.