Three-way: author line with three different values
Tests ability to resolve a three-way author-name conflict in rebase. Evaluates complex merge decisions with rebase polarity.
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
echo 'Author: J. Doe' > author.txt - 13
git add author.txt - 14
git commit -m 'Use initials' - 15
git rebase fullname
Prompt
Resolve the rebase conflict in author.txt. Base was 'Author: John'. The upstream fullname branch set 'Author: John Smith'. The current branch being rebased (main) set 'Author: J. Doe'. Keep the current branch value. 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"
}
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
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"}