Multi-file: conflict in settings.json only
Tests ability to resolve a JSON config conflict during rebase preserving valid syntax. Evaluates structured-data conflict 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
printf '{ "name": "app", "version": "1.0.0" }' > settings.json - 05
printf 'DB_HOST=localhost DB_PORT=5432' > database.ini - 06
git add settings.json database.ini - 07
git commit -m 'Initial config' - 08
git checkout -b v2 - 09
printf '{ "name": "app", "version": "2.0.0" }' > settings.json - 10
git add settings.json - 11
git commit -m 'Bump version to 2.0.0' - 12
git checkout main - 13
printf '{ "name": "MyApp", "version": "1.0.0" }' > settings.json - 14
git add settings.json - 15
git commit -m 'Rename app to MyApp' - 16
git rebase v2
Prompt
Resolve the rebase conflict in settings.json. The base had name: app, version: 1.0.0. Branch being rebased (v2) kept name: app but bumped version to 2.0.0. Main branch renamed name to MyApp but kept version 1.0.0. Provide ONLY the resolved settings.json content as valid JSON.
Expected
{
"name": "MyApp",
"version": "2.0.0"
}
Campaign Evidence
Loading campaign evidence…
Model Outputs (14)
{
"name": "MyApp",
"version": "2.0.0"
}
{
"name": "MyApp",
"version": "2.0.0"
}
JSON Schema
Structured Output
(raw) {
"resolved_content": "{\n \"name\": \"MyApp\",\n \"version\": \"2.0.0\"\n}"
}
```json
{
"name": "MyApp",
"version": "2.0.0"
}
```
{
"name": "MyApp",
"version": "2.0.0"
}
JSON Schema
Structured Output
(raw) {
"resolved_content": "{\n \"name\": \"MyApp\",\n \"version\": \"2.0.0\"\n}"
}
```json
{
"name": "MyApp",
"version": "2.0.0"
}
```
{
"name": "MyApp",
"version": "2.0.0"
}
JSON Schema
Structured Output
(raw) {"resolved_content":"{\n \"name\": \"MyApp\",\n \"version\": \"2.0.0\"\n}"}
{
"name": "MyApp",
"version": "2.0.0"
}
{
"name": "MyApp",
"version": "2.0.0"
}
JSON Schema
Structured Output
(raw) {
"resolved_content": "{\n \"name\": \"MyApp\",\n \"version\": \"2.0.0\"\n}"
}
{
"name": "MyApp",
"version": "2.0.0"
}
{
"name": "MyApp",
"version": "2.0.0"
}
{
"name": "MyApp",
"version": "2.0.0"
}
JSON Schema
Structured Output
(raw) {"resolved_content": "{\n \"name\": \"MyApp\",\n \"version\": \"2.0.0\"\n}"}
{
"name": "MyApp",
"version": "2.0.0"
}
{
"name": "MyApp",
"version": "2.0.0"
}
JSON Schema
Structured Output
(raw) {"resolved_content": "{\n \"name\": \"MyApp\",\n \"version\": \"2.0.0\"\n}"}
{
"name": "MyApp",
"version": "1.0.0"
}
JSON Schema
Structured Output
(raw) {
"resolved_content": "{\n \"name\": \"MyApp\",\n \"version\": \"1.0.0\"\n}"
}
Failure: Expected '{
"name": "MyApp",
"version": "2.0.0"
}
', got '{
"name": "MyApp",
"version": "1.0.0"
}'