Single-line version number conflict
Tests ability to resolve a version number conflict during rebase. Evaluates handling of semantic version clashes 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 'VERSION=1.0.0' > version.txt - 05
git add version.txt - 06
git commit -m 'Initial version' - 07
git checkout -b release - 08
echo 'VERSION=2.0.0' > version.txt - 09
git add version.txt - 10
git commit -m 'Bump major version' - 11
git checkout main - 12
echo 'VERSION=1.1.0' > version.txt - 13
git add version.txt - 14
git commit -m 'Bump minor version' - 15
git rebase release
Prompt
Resolve the rebase conflict in version.txt. The base version was 'VERSION=1.0.0'. The upstream release branch set it to 'VERSION=2.0.0'. The current branch being rebased (main) set it to 'VERSION=1.1.0'. Keep the current branch value. Provide ONLY the resolved file content.
Expected
VERSION=1.1.0
Campaign Evidence
Loading campaign evidence…
Model Outputs (14)
VERSION=1.1.0
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0"
}
VERSION=1.1.0
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0"
}
VERSION=1.1.0
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=1.1.0"}
VERSION=1.1.0
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0"
}
VERSION=1.1.0
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0"
}
VERSION=1.1.0
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=1.1.0"}
VERSION=1.1.0
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0"
}