Single-line status message conflict
Tests ability to resolve a status-message conflict during rebase. Evaluates choosing between contradictory values in rebase context.
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 rebase fix
Prompt
Resolve the rebase conflict in status.txt. The base was 'Status: OK'. The upstream fix branch changed it to 'Status: Resolved'. The current branch being rebased (main) changed it to 'Status: Failed'. Keep the current branch value. Provide ONLY the resolved file content.
Expected
Status: Failed
Campaign Evidence
Loading campaign evidence…
Model Outputs (14)
Status: Failed
Status: Failed
JSON Schema
Structured Output
(raw) {
"resolved_content": "Status: Failed"
}
Status: Failed
Status: Failed
JSON Schema
Structured Output
(raw) { "resolved_content": "Status: Failed" }
Status: Failed
Status: Failed
JSON Schema
Structured Output
(raw) {"resolved_content": "Status: Failed"}
Status: Failed
Status: Failed
JSON Schema
Structured Output
(raw) {
"resolved_content": "Status: Failed"
}
Status: Failed
Status: Failed
JSON Schema
Structured Output
(raw) { "resolved_content": "Status: Failed\n"}
Status: Failed
Status: Failed
JSON Schema
Structured Output
(raw) {"resolved_content": "Status: Failed"}
Status: Failed
Status: Failed
JSON Schema
Structured Output
(raw) {
"resolved_content": "Status: Failed"
}