Three-way: multiple files with conflicting and non-conflicting changes
Tests ability to handle cherry-pick where some files conflict and others merge cleanly. Evaluates understanding of partial-conflict scenarios.
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 cherry-pick $(git rev-parse branch-a)
Prompt
Resolve the cherry-pick conflict in project.txt. The incoming commit set Title: My Project v2. The current branch (main) has 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"
}
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
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
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"}
To resolve this cherry-pick conflict, I need to choose the higher version as specified in the requirements. Since v3 is higher than v2, I should select the content from the current branch (HEAD).
Here is the resolved project.txt content:
```
Title: My Project v3
```
Failure: Expected 'Title: My Project v3', got '
To resolve this cherry-pick conflict, I need to choose the higher version as specified in the requirements. Since v3 is higher than v2, I should select the content from the current branch (HEAD).
Here is the resolved project.txt content:
```
Title: My Project v3
```
'