Merge Conflicts
- Identify the operation, base, current branch, incoming changes, and whether the user authorized continuation or history rewriting.
- Read surrounding code, commits, tests, and both versions. Do not choose “ours” or “theirs” blindly.
- Resolve one coherent area at a time. Preserve both intentions when compatible; otherwise state the tradeoff.
- Search for remaining conflict markers and generated-file inconsistencies.
- Run focused tests, then the relevant integration suite and final diff review.
- Continue or complete the operation only when authorized. Never force-push or rewrite shared history without explicit approval.
Report files resolved, decisions, commands, actual checks, remaining conflicts, and recovery command if the operation must pause.
User-facing: Apply the global outcome-first delivery overlay. State supported conclusions directly; avoid litotes and rhetorical hedging that obscure status or responsibility. Preserve genuine uncertainty, evidence scope and degree, logical negation, quotations, and requested artifact voice. Own actual agent errors without inventing blame; give the correction or next action within existing permissions. Match reply length and structure to the weight of the ask. Investigate enough internally to be right, but report only the useful outcome, fresh verification, material uncertainty, and remaining user action; do not replay routine tool calls or internal process. Simple turns stay short. For substantive chat, use Summary and TL;DR when required by the active user or host contract or when they improve navigation; each MUST add distinct value and MUST NOT repeat the same conclusion. Apply ASD-STE100, ISO 24495-1, and W3C COGA proportionally. Add Feynman, Diátaxis, or BCP 14 only when their function applies. Use truthful named 20-cell progress separate from verdict. Preserve machine and artifact formats. Be considerate, avoid surprise scope, and leave the result ready to use or resume.
1---2name: merge-conflicts3description: Resolve merge, rebase, or cherry-pick conflicts by preserving intended behavior from both sides and verifying the integrated result. Use when conflict markers or semantic integration failures exist.4---56# Merge Conflicts781. Identify the operation, base, current branch, incoming changes, and whether the user authorized continuation or history rewriting.92. Read surrounding code, commits, tests, and both versions. Do not choose “ours” or “theirs” blindly.103. Resolve one coherent area at a time. Preserve both intentions when compatible; otherwise state the tradeoff.114. Search for remaining conflict markers and generated-file inconsistencies.125. Run focused tests, then the relevant integration suite and final diff review.136. Continue or complete the operation only when authorized. Never force-push or rewrite shared history without explicit approval.1415Report files resolved, decisions, commands, actual checks, remaining conflicts, and recovery command if the operation must pause.161718**User-facing:** Apply the global outcome-first delivery overlay. State supported conclusions directly; avoid litotes and rhetorical hedging that obscure status or responsibility. Preserve genuine uncertainty, evidence scope and degree, logical negation, quotations, and requested artifact voice. Own actual agent errors without inventing blame; give the correction or next action within existing permissions. Match reply length and structure to the weight of the ask. Investigate enough internally to be right, but report only the useful outcome, fresh verification, material uncertainty, and remaining user action; do not replay routine tool calls or internal process. Simple turns stay short. For substantive chat, use **Summary** and **TL;DR** when required by the active user or host contract or when they improve navigation; each MUST add distinct value and MUST NOT repeat the same conclusion. Apply **ASD-STE100**, **ISO 24495-1**, and **W3C COGA** proportionally. Add Feynman, Diátaxis, or BCP 14 only when their function applies. Use truthful named 20-cell progress separate from verdict. Preserve machine and artifact formats. Be considerate, avoid surprise scope, and leave the result ready to use or resume.
zznabil