Three-way: multiple files with conflicting and non-conflicting changes
Tests ability to handle rebase with partial conflicts across files. Evaluates understanding of clean vs conflicted files in rebase.
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 'Title: My Project' > project.txt - 05
echo 'File A content' > file_a.txt - 06
echo 'File B content' > file_b.txt - 07
git add project.txt file_a.txt file_b.txt - 08
git commit -m 'Initial project' - 09
git checkout -b branch-a - 10
echo 'Title: My Project v2' > project.txt - 11
echo 'File A updated' > file_a.txt - 12
git add project.txt file_a.txt - 13
git commit -m 'Update title and file A' - 14
git checkout main - 15
echo 'Title: My Project v3' > project.txt - 16
echo 'File B updated' > file_b.txt - 17
git add project.txt file_b.txt - 18
git commit -m 'Update title and file B' - 19
git rebase branch-a
Prompt
Resolve the rebase conflict in project.txt. Branch being rebased set Title: My Project v2. Main branch set Title: My Project v3. Both branches also updated different files (file_a and file_b) without conflicts. For the project.txt conflict, the higher version is more appropriate. Provide ONLY the resolved project.txt content.
Expected
Title: My Project v3
Campaign Evidence
Loading campaign evidence…
Model Outputs (14)
Title: My Project v3
Title: My Project v3
JSON Schema
Structured Output
(raw) {
"resolved_content": " Title: My Project v3\n"
}
Title: My Project v3
Title: My Project v3
JSON Schema
Structured Output
(raw) {
"resolved_content": "Title: My Project v3"
}
Title: My Project v3
JSON Schema
Structured Output
(raw) {"resolved_content": "Title: My Project v3"}
Title: My Project v3
Title: My Project v3
JSON Schema
Structured Output
(raw) {
"resolved_content": "Title: My Project v3"
}
Title: My Project v3
JSON Schema
Structured Output
(raw) {
"resolved_content": "Title: My Project v3"
}
Title: My Project v3
Title: My Project v3
JSON Schema
Structured Output
(raw) {"resolved_content": "Title: My Project v3"}
Title: My Project v3
JSON Schema
Structured Output
(raw) {"resolved_content": "Title: My Project v3"}
The resolved `project.txt` content should keep the higher version number (v3) from the main branch:
```
Title: My Project v3
```
Failure: Expected 'Title: My Project v3', got 'The resolved `project.txt` content should keep the higher version number (v3) from the main branch:
```
Title: My Project v3
```'
<<<<<<< HEAD
Title: My Project v3
>>>>>>> fa53c71 (Update title and file B)
Title: My Project v3
=======
Title: My Project v2
>>>>>>> fa53c71 (Update title and file B)
=======
Title: My Project v3
>>>>>>> fa53c71 (Update title and file B)
Failure: Expected 'Title: My Project v3', got '<<<<<<< HEAD
Title: My Project v3
>>>>>>> fa53c71 (Update title and file B)
Title: My Project v3
=======
Title: My Project v2
>>>>>>> fa53c71 (Update title and file B)
=======
Title: My Project v3
>>>>>>> fa53c71 (Update title and file B)'
I'll resolve this rebase conflict by choosing the higher version (v3) as specified, since it's more appropriate.
```
Title: My Project v3
```
Failure: Expected 'Title: My Project v3', got '
I'll resolve this rebase conflict by choosing the higher version (v3) as specified, since it's more appropriate.
```
Title: My Project v3
```
'