Three-way: author line with three different values
Tests ability to resolve a three-way author-name conflict where all three values differ. Evaluates complex merge decisions.
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 'Author: John' > author.txt - 05
git add author.txt - 06
git commit -m 'Initial author' - 07
git checkout -b fullname - 08
echo 'Author: John Smith' > author.txt - 09
git add author.txt - 10
git commit -m 'Use full name' - 11
git checkout main - 12
git checkout -b initials - 13
echo 'Author: J. Doe' > author.txt - 14
git add author.txt - 15
git commit -m 'Use initials' - 16
git checkout main - 17
git merge fullname - 18
git merge initials
Prompt
Resolve the merge conflict in author.txt. Three different authors were set: base 'Author: John', branch A 'Author: John Smith', branch B 'Author: J. Doe'. Both branches were merged into main (fullname first, then initials). Keep the value from the second merge side. Provide ONLY the resolved file content.
Expected
Author: J. Doe
Campaign Evidence
Loading campaign evidence…
Model Outputs (14)
Author: J. Doe
Author: J. Doe
JSON Schema
Structured Output
(raw) {
"resolved_content": "Author: J. Doe\n"
}
Author: J. Doe
Author: J. Doe
JSON Schema
Structured Output
(raw) {
"resolved_content": "Author: J. Doe"
}
Author: J. Doe
Author: J. Doe
JSON Schema
Structured Output
(raw) {"resolved_content": "Author: J. Doe"}
Author: J. Doe
Author: J. Doe
JSON Schema
Structured Output
(raw) {
"resolved_content": "Author: J. Doe"
}
Author: J. Doe
JSON Schema
Structured Output
(raw) {
"resolved_content": "Author: J. Doe\n"
}
Author: J. Doe
Author: J. Doe
JSON Schema
Structured Output
(raw) {"resolved_content": "Author: J. Doe"}
Author: J. Doe
Author: J. Doe
JSON Schema
Structured Output
(raw) {"resolved_content": "Author: J. Doe"}
Author: John Smith
Failure: Expected 'Author: J. Doe', got 'Author: John Smith'