Single-line status message conflict
Tests ability to resolve a status-message conflict. Evaluates choosing between conflicting status values from different branches.
Baseline Repository
These commands set up the repo before the model sees the prompt. They define the starting file structure, staged changes, and Git history.
- 01
git init - 02
git config user.email 'test@test.com' - 03
git config user.name 'Test User' - 04
echo 'Status: OK' > status.txt - 05
git add status.txt - 06
git commit -m 'Initial status' - 07
git checkout -b fix - 08
echo 'Status: Resolved' > status.txt - 09
git add status.txt - 10
git commit -m 'Fix status' - 11
git checkout main - 12
echo 'Status: Failed' > status.txt - 13
git add status.txt - 14
git commit -m 'Update status' - 15
git cherry-pick $(git rev-parse fix)
Prompt
Resolve the cherry-pick conflict in status.txt. The base was 'Status: OK'. The incoming commit changed it to 'Status: Resolved'. The current branch has 'Status: Failed'. Provide ONLY the resolved file content.
Expected
Status: Resolved
Campaign Evidence
Loading campaign evidence…
Model Outputs (14)
Status: Resolved
Status: Resolved
JSON Schema
Structured Output
(raw) {
"resolved_content": "Status: Resolved"
}
Status: Resolved
Status: Resolved
JSON Schema
Structured Output
(raw) {
"resolved_content": "Status: Resolved"
}
Status: Resolved
Status: Resolved
JSON Schema
Structured Output
(raw) {"resolved_content": "Status: Resolved"}
Status: Resolved
Status: Resolved
JSON Schema
Structured Output
(raw) {
"resolved_content": "Status: Resolved"
}
Status: Resolved
Status: Resolved
JSON Schema
Structured Output
(raw) {
"resolved_content": "Status: Resolved"
}
Status: Resolved
Status: Resolved
JSON Schema
Structured Output
(raw) {"resolved_content": "Status: Resolved"}
```
Status: Failed
```
Failure: Expected 'Status: Resolved', got '
```
Status: Failed
```
'
Status: Failed
JSON Schema
Structured Output
(raw) {"resolved_content": "Status: Failed"}
Failure: Expected 'Status: Resolved', got 'Status: Failed'