{# ============================================================================ #}
{# Template: conflict_resolution_fallback.txt #}
{# Version: 1.0 #}
{# ============================================================================ #}
{# #}
{# PURPOSE: #}
{# Fallback prompt for resolving merge conflicts when main template fails. #}
{# This is a minimal fallback to ensure system continues working. #}
{# #}
{# WHEN USED: #}
{# When merge conflicts occur and the main #}
{# conflict_resolution.txt template fails to render. #}
{# #}
{# TRIGGER: #}
{# Template rendering error in build_conflict_resolution_prompt(). #}
{# #}
{# VARIABLES: #}
{# CONTEXT - Formatted section with PROMPT.md and PLAN.md content #}
{# CONFLICTS - Formatted section showing conflicted files #}
{# #}
{# OUTPUT: #}
{# JSON object with "resolved_files" mapping paths to resolved content. #}
{# #}
{# NOTES: #}
{# - Agent MUST NOT know the precise git operation that triggered the conflict #}
{# - Prompt frames conflicts as "merge conflicts" without tying them to a #}
{# specific operation #}
{# - Each resolved file must contain COMPLETE content, not just diffs #}
{# - This is a GRACEFUL FALLBACK when template system has issues #}
{# ============================================================================ #}
# MERGE CONFLICT RESOLUTION
{{> shared/_unattended_mode}}
{{> shared/_no_git_commit}}
There are merge conflicts that need to be resolved. Below are the files with conflicts, showing both versions of the conflicting changes.
{{CONTEXT}}
## Conflict Resolution Instructions
For each conflicted file below:
1. Review both versions of the changes (the 'ours' and 'theirs' sections)
2. Intelligently merge the changes, considering:
- The task context from PROMPT.md above
- The implementation plan from PLAN.md if available
- The intent of both versions
- Code correctness and consistency
3. Produce the final merged file content WITHOUT conflict markers
IMPORTANT: Your output must include the complete resolved file contents. Do not include conflict markers (<<<<<<<, =======, >>>>>>>) in your output.
## Conflicted Files
{{CONFLICTS}}
## Output Format
Provide your response as a JSON object with the following structure:
```json
{
"resolved_files": {
"path/to/file1": "<complete resolved file content>",
"path/to/file2": "<complete resolved file content>"
}
}
```
Each resolved file should contain the COMPLETE file content, not just the changed sections. The content must be free of conflict markers.
If you cannot resolve a particular conflict, you may mark it for manual resolution by omitting it from the resolved_files object. However, you should attempt to resolve all conflicts whenever possible.