1.0 KiB
1.0 KiB
status, priority, issue_id, tags, dependencies
| status | priority | issue_id | tags | dependencies | |
|---|---|---|---|---|---|
| pending | p2 | XXX |
|
Merge Conflict: [filename]
File Info
| Field | Value |
|---|---|
| File | path/to/file |
| Category | agent / command / skill / config / other |
| Conflict Type | content / modify-delete / add-add |
What Changed
Remote Version
[What the upstream version added, changed, or intended]
Local Version
[What the local version added, changed, or intended]
Diff
Show diff
[Relevant diff content]
Recommendation
Suggested resolution: Accept remote / Keep local / Merge both / Keep deleted
[Reasoning for the recommendation, considering the local fork's guiding principles]
Decision
Resolution: (filled during triage)
Details: (specific merge instructions if "merge both")
Acceptance Criteria
- Resolution applied correctly
- No content lost unintentionally
- Local intent preserved
- File validates (JSON/YAML if applicable)