reconcile-merge-conflicts

Resolve merge and rebase conflicts by preserving intent from both sides while preventing regressions.

Safety rules:

• Allow local git edits needed for reconciliation.
• Allow remote read-only git/GitHub operations (fetch, logs, PR metadata reads).
• Never run git push.
• Never run any git reset variant.

Step 1: Detect operation state and workspace safety

Run:

git status --porcelain=v1 -b
git status

Classify state: