f007 — rebase

Three-way: conflicting port and protocol settings in same line range

Tests ability to resolve a three-way rebase conflict with port and protocol. Evaluates multi-dimensional conflict with rebase context.

hard rebase three-way port protocol conflict-resolution

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 'PORT=8080 PROTOCOL=http' > config.txt
05 git add config.txt
06 git commit -m 'Initial config'
07 git checkout -b branch-a
08 printf 'PORT=8443 PROTOCOL=https' > config.txt
09 git add config.txt
10 git commit -m 'Use HTTPS port'
11 git checkout main
12 git checkout -b branch-b
13 printf 'PORT=9090 PROTOCOL=http' > config.txt
14 git add config.txt
15 git commit -m 'Change to non-standard port'
16 git checkout main
17 git merge branch-a
18 git rebase branch-b

Prompt

Resolve the rebase conflict in config.txt. Three different configurations were attempted: base PORT=8080/PROTOCOL=http, branch being rebased PORT=9090/PROTOCOL=http, main's version PORT=8443/PROTOCOL=https (from branch-a merge). Prefer the HTTPS configuration when there is a conflict. Provide ONLY the resolved config.txt content.

Expected

PORT=8443 PROTOCOL=https

Campaign Evidence

Loading campaign evidence…

Model Outputs (14)

deepseek/deepseek-v4-flash:high PASS 100% 131 in → 141 out (130 reasoning)

PORT=8443 PROTOCOL=https

deepseek/deepseek-v4-flash:high__json_schema PASS 100% 131 in → 146 out (125 reasoning)

PORT=8443 PROTOCOL=https

JSON Schema Structured Output

(raw) { "resolved_content": "PORT=8443\nPROTOCOL=https" }

deepseek/deepseek-v4-flash:none PASS 100% 130 in → 10 out (0 reasoning)

PORT=8443 PROTOCOL=https

deepseek/deepseek-v4-flash:none__json_schema PASS 100% 134 in → 19 out (0 reasoning)

PORT=8443 PROTOCOL=https

JSON Schema Structured Output

(raw) { "resolved_content": "PORT=8443\nPROTOCOL=https" }

mistralai/devstral-2512__json_schema PASS 100% 143 in → 19 out

PORT=8443 PROTOCOL=https

JSON Schema Structured Output

(raw) {"resolved_content": "PORT=8443\nPROTOCOL=https"}

nvidia/nemotron-3-nano-30b-a3b:high PASS 100% 155 in → 172 out (176 reasoning)

PORT=8443 PROTOCOL=https

nvidia/nemotron-3-nano-30b-a3b:none PASS 100% 157 in → 12 out (0 reasoning)

PORT=8443 PROTOCOL=https

poolside/laguna-xs.2:high PASS 100% 182 in → 214 out (201 reasoning)

PORT=8443 PROTOCOL=https

poolside/laguna-xs.2:high__json_schema PASS 100% 182 in → 236 out (218 reasoning)

PORT=8443 PROTOCOL=https

JSON Schema Structured Output

(raw) {"resolved_content": "PORT=8443\nPROTOCOL=https"}

poolside/laguna-xs.2:none PASS 100% 182 in → 12 out (0 reasoning)

PORT=8443 PROTOCOL=https

poolside/laguna-xs.2:none__json_schema PASS 100% 179 in → 17 out (0 reasoning)

PORT=8443 PROTOCOL=https

JSON Schema Structured Output

(raw) {"resolved_content": "PORT=8443\nPROTOCOL=https"}

mistralai/devstral-2512 FAIL 0% 144 in → 30 out

Here's the resolved `config.txt` content with the HTTPS configuration preferred: ``` PORT=8443 PROTOCOL=https ```

Failure: Expected 'PORT=8443 PROTOCOL=https ', got 'Here's the resolved `config.txt` content with the HTTPS configuration preferred: ``` PORT=8443 PROTOCOL=https ```'

nvidia/nemotron-3-nano-30b-a3b:high__json_schema FAIL 0% 156 in → 135 out (116 reasoning)

PORT=8443\nPROTOCOL=https

JSON Schema Structured Output

(raw) { "resolved_content": "PORT=8443\\nPROTOCOL=https" }

Failure: Expected 'PORT=8443 PROTOCOL=https ', got 'PORT=8443\nPROTOCOL=https'

nvidia/nemotron-3-nano-30b-a3b:none__json_schema FAIL 0% 157 in → 26 out (0 reasoning)

[resolved] PORT=8443\nPROTOCOL=https

JSON Schema Structured Output

(raw) { "resolved_content": "[resolved] PORT=8443\\nPROTOCOL=https" }

Failure: Expected 'PORT=8443 PROTOCOL=https ', got '[resolved] PORT=8443\nPROTOCOL=https'