resolve-merge

You can automate resolving git merge conflicts by applying a gate-driven workflow that auto-resolves deterministic cases like identical content or whitespace-only differences, while safely prompting for human intervention on complex files.

Fixing failed git merges with UU or AA/DD conflicts involves reconciling conflicting edits, removing conflict markers, and classifying files for either automatic resolution or manual judgment to ensure a clean working tree.

Merge conflicts can desynchronize numbered plan documents and chronicle references, requiring automated renumbering and reference updates during conflict resolution to maintain structural consistency across the version control history.

You can automatically resolve git rebase failures for safe, deterministic cases like whitespace-only differences, but a gate-driven workflow will prompt for human input on complex files to prevent incorrect reconciliations.

You should not use automated conflict resolution for complex files with conflicting logic edits, as the workflow classifies these as JUDGMENT cases requiring human intervention to ensure no remaining conflict markers or broken code.