Conflict Resolution

Purpose

Resolve or report overlapping changes without losing user work.

Practices

• Inspect git status before editing.
• Verify the active workflow branch before editing.
• Treat unexpected local changes as user-owned unless proven otherwise.
• Do not revert unrelated changes.
• Assign disjoint file ownership for parallel work.
• Do not switch branches while unrelated or unclear uncommitted changes exist.
• Stop and ask when a user-owned change makes the task impossible to complete safely.

Verification