Multi-line address block conflict
Tests ability to resolve a multi-line address block conflict during rebase. Evaluates combining partial updates with correct 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
printf 'Name: John Doe Email: john@example.com Phone: 555-1234' > contact.txt - 05
git add contact.txt - 06
git commit -m 'Initial contact' - 07
git checkout -b work - 08
printf 'Name: John Doe Email: john@company.com Phone: 555-1234' > contact.txt - 09
git add contact.txt - 10
git commit -m 'Use work email' - 11
git checkout main - 12
printf 'Name: John Doe Email: johndoe@personal.com Phone: 555-9876' > contact.txt - 13
git add contact.txt - 14
git commit -m 'Update contact info' - 15
git rebase work
Prompt
Resolve the rebase conflict in contact.txt. The base had john@example.com and 555-1234. Branch being rebased kept john@example.com but updated the email to john@company.com. Main branch updated both to johndoe@personal.com and 555-9876. Provide ONLY the resolved file content with the most complete updates.
Expected
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Fixture Metrics
Scoped model quality, cost, API time, and token usage for rebase/f004.
Loading...
Raw Attempt Evidence
Loading raw attempt evidence…
Model Outputs (546)
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
google/gemini-3.1-flash-lite-preview:xhigh__json_schema PASS 100%
224 in → 2,238 out (2,198 reasoning)
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) { "resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n" }
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw)
{
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) { "resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n" }
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) { "resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876" }
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```txt
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
(empty output)
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
Reasoning: The rebased branch intentionally updated the email to `john@company.com`, while main updated the phone to `555-9876`. Combining both changes preserves the most complete set of updates (the branch's email change and main's phone change).
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
(empty output)
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
**Reasoning:** The branch being rebased deliberately changed the email to `john@company.com` (its only intentional change), while main's only unique update was the phone number `555-9876`. Combining both intentional changes preserves the most complete set of updates from each side.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
(empty output)
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
The main branch has the most complete updates with both fields modified, whereas the branch being rebased only updated the email while keeping the original phone number.
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
The main branch updated both fields comprehensively, making it the most complete version of the contact information.
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
The incoming branch (main) has the most complete updates, modifying both the email and phone number, whereas the rebasing branch only updated the email.
Failure: Content mismatch: ['contact.txt']
## Resolved `contact.txt`
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
### Reasoning
| Field | Base | Main Branch | Rebased Branch | Resolution |
|-------|------|-------------|---------------|------------|
| Email | `john@example.com` | `johndoe@personal.com` | `john@company.com` | **`john@company.com`** — intentional update by the rebased branch |
| Phone | `555-1234` | `555-9876` | `555-1234` (unchanged) | **`555-9876`** — only main changed it, rebased branch had no opinion |
The **most complete** resolution cherry-picks the deliberate changes from **both** sides:
- **Email** → The rebased branch *specifically* updated it to `john@company.com` (its whole purpose), so that intent is preserved.
- **Phone** → The rebased branch never touched it (still `555-1234`), so main's update to `555-9876` is accepted without conflict.
This avoids discarding any intentional update from either branch.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
## Resolved `contact.txt`
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
## Reasoning
| Field | Base | HEAD (being rebased) | Main (onto) | Resolution |
|-------|------|----------------------|-------------|------------|
| Email | `john@example.com` | `john@company.com` ✅ | `johndoe@personal.com` | **Keep rebased branch's intentional update** |
| Phone | `555-1234` | `555-1234` (unchanged) | `555-9876` ✅ | **Keep main's update** (only branch that changed it) |
The **most complete** resolution combines the **intentional**, non-overlapping updates from both branches:
1. **Email**: The rebased branch *deliberately* changed it from `john@example.com` → `john@company.com`. This is the specific change being rebased, so it's preserved.
2. **Phone**: Only main updated `555-1234` → `555-9876`. Since the rebased branch never touched it, main's update is accepted outright.
This follows the rebase intent: **replay the feature branch's purposeful changes on top of main's current state**.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
**Reasoning:**
- **Email:** The base had `john@example.com`. The rebased branch intentionally changed it to `john@company.com`, while main changed it to `johndoe@personal.com`. Both sides updated the email, but `john@company.com` is the change from the branch being rebased (the current work), so it represents the most recent intentional update during the rebase.
- **Phone:** The base had `555-1234`. The rebased branch kept `555-1234` (no change), while main updated it to `555-9876`. Since only main updated the phone number, we take `555-9876` as the most complete update.
This gives us the **most complete updates** from both sides: the rebased branch's new email and main's new phone number.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
## Resolved `contact.txt`
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
## Reasoning
| Field | Base | Main Branch | Rebased Branch | Resolution |
|-------|------|-------------|---------------|------------|
| Email | `john@example.com` | `johndoe@personal.com` | `john@company.com` | **`john@company.com`** — The rebased branch intentionally updated this; its commits are being replayed *on top of* main, representing the latest intent. |
| Phone | `555-1234` | `555-9876` | `555-1234` (unchanged) | **`555-9876`** — The rebased branch never touched the phone, so main's update to `555-9876` is accepted. |
This gives the **most complete** result: the deliberate email change from the rebased branch is preserved, while main's phone number update (which the rebased branch had no opinion on) is also kept. No change from either branch is lost.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
This resolution combines the meaningful updates from both branches:
- **Email**: `john@company.com` — the intentional update from the branch being rebased (main's email change was superseded by this newer edit)
- **Phone**: `555-9876` — the only phone update (from main); the rebased branch left it unchanged at the old value
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
**Reasoning for this resolution:**
- **Phone → 555-9876:** The base value was `555-1234`. The branch being rebased left the phone *unchanged*, while main deliberately updated it to `555-9876`. Since only main made a real change here, that update should be preserved (no true conflict on phone).
- **Email → john@company.com:** This is the genuine conflict—both sides changed the email from the base (`john@example.com`). Because this is a rebase, the whole point is to replay and preserve the feature branch's intentional work on top of main. The branch being rebased specifically updated the email to `john@company.com`, so that deliberate change is kept.
The result combines main's phone update with the rebased branch's email update, giving the most complete set of intentional changes.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
This resolution preserves every distinct update:
- **Email → john@company.com**: The rebased branch explicitly updated this (its intent takes precedence as the commit being replayed).
- **Phone → 555-9876**: Only main changed the phone (the branch left it at the base value 555-1234), so main's update is the meaningful one to keep.
This keeps the most complete, non-redundant set of changes from both sides rather than discarding either branch's real update.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
**Reasoning for the resolution:**
- **Email:** The base was `john@example.com`. Both branches changed it:
- The rebased branch updated it to `john@company.com`.
- Main updated it to `johndoe@personal.com`.
Your instruction says the branch being rebased "kept john@example.com but updated the email to john@company.com" — so the intended active change on your branch is `john@company.com`. I preserved that.
- **Phone:** The base was `555-1234`. Only main changed it to `555-9876` (your rebased branch kept the original `555-1234`). Since main made a real update and your branch made no intentional change, `555-9876` is the more complete/newer value.
⚠️ **Note:** The email is a genuine conflicting update — both sides deliberately changed the same field to different values. I chose `john@company.com` based on your stated intent, but if `johndoe@personal.com` (personal) was meant to supersede the company address, swap it accordingly. Verify with your team which email is authoritative.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
**Resolution rationale:**
- The main branch (`2eaff6d`) updated **both** fields, representing the most complete set of changes
- The rebasing branch only updated the email (from `john@example.com` → `john@company.com`) but left the phone unchanged at the base value (`555-1234`)
- Since the main branch made deliberate updates to both fields (`johndoe@personal.com` and `555-9876`), those represent the most fully updated state and are accepted in their entirety
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
**Resolution rationale:**
- The base had `john@example.com` / `555-1234`
- The rebased branch only updated the email → `john@company.com` (1 field changed)
- The main branch (commit `65edf85`) updated **both** email → `johndoe@personal.com` and phone → `555-9876` (2 fields changed)
- Keeping main branch's version preserves the **most complete** set of updates, as it modified both fields versus the single-field change from the rebased branch
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
**Resolution reasoning:**
The main branch (`ae15dcc`) represents the **most complete update** — it changed **both** the email and phone number. The rebased branch only partially updated the email field while leaving the phone unchanged from base. Since the goal is to preserve the most complete set of changes, the main branch's version of both fields is accepted in full.
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
**Resolution rationale:** The main branch (incoming commit `0d76564`) updated **both** fields (email and phone), making it the most complete set of changes. The rebasing branch only updated the email while leaving the phone at the base value (`555-1234`), indicating a partial update. Accepting the main branch's version preserves the more thorough revision.
Failure: Content mismatch: ['contact.txt']
Looking at this conflict, I need to determine the most complete and intentional set of updates:
- **Branch being rebased**: changed email (john@example.com → john@company.com), left phone unchanged (555-1234)
- **Main branch**: changed both email (→ johndoe@personal.com) and phone (→ 555-9876)
Since main branch made a more complete update (both fields), and the rebasing branch only touched the email field while leaving phone untouched (matching the original base value), main's changes represent the more complete/recent update. The rebasing branch's email change doesn't have information suggesting it should override main's email change — main's update touches both fields together, suggesting a coordinated contact info update.
**Resolved contact.txt:**
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
Failure: Content mismatch: ['contact.txt']
Invalid JSON. Output:
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Invalid JSON. Output:
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Invalid JSON. Output:
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Name: John Doe
Email:johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email:johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email:johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name:John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name:John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Invalid JSON. Output: Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Here is the resolved file content with the most complete updates:
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) { "resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n" }
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
```
Name: John Doe
Email: john@company.com
Phone: 555-9876
```
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe Email: john@company.com Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe Email: john@company.com Phone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
Failure: Content mismatch: ['contact.txt']
Here is the **resolved** `contact.txt` file with the most complete updates, merging both branches' changes logically:
```txt
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
### Explanation:
- **HEAD** (branch being rebased) has:
- Email: `john@company.com`
- Phone: `555-1234`
- **1fd0129** (base branch) has:
- Email: `johndoe@personal.com`
- Phone: `555-9876`
Since the branch being rebased kept `john@example.com` but updated the email to `john@company.com`, while the base branch updated both fields, the most complete resolution merges both sets of updates into a single, consistent record.
If you want to keep both versions or clarify which change came from where, let me know! But for a standard merge, the above is correct.
Failure: Content mismatch: ['contact.txt']
Invalid JSON. Output: Here is the **resolved** `contact.txt` file with the most complete updates, merging both branches' changes logically and consistently:
```txt
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
### Explanation:
- **HEAD** (your branch):
- Email: `john@company.com`
- Phone: `555-1234`
- **b044c6b** (merge target / base):
- Email: `johndoe@personal.com`
- Phone: `555-9876`
**Resolution:**
- Keep the new email (`johndoe@personal.com`) from your branch.
- Keep the new phone number (`555-9876`) from your branch.
- Remove the old email and phone from the base.
This resolves the conflict by choosing the latest values from your branch, as is typical for a rebase. If you want to keep both emails/phones, you would need to merge them explicitly, but based on your instructions, this is the most complete update.
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Invalid JSON. Output:
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Here's the resolved file content with the most complete updates:
```
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
```
This resolution keeps:
1. The name unchanged (as it wasn't modified in either branch)
2. The email from the main branch (johndoe@personal.com) which is more complete than the branch being rebased
3. The phone number from the main branch (555-9876) which is the updated version
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw)
{
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\\nEmail: johndoe@personal.com\\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content":"Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: johndoe@personal.com
Phone: 555‑9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
--- contact.txt
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
---
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
</think>Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-1234
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-1234"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-9b67ea31-84e0-9f16-895a-05eb1c37c981","request_id":"9b67ea31-84e0-9f16-895a-05eb1c37c981"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-3c66f879-c7d8-96a8-af5c-50d54fb3f722","request_id":"3c66f879-c7d8-96a8-af5c-50d54fb3f722"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-5dc4a99e-631b-9dcc-8378-e6f6af343e7d","request_id":"5dc4a99e-631b-9dcc-8378-e6f6af343e7d"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-fe2b1182-c80e-9b94-ab0b-2e89cf108aa7","request_id":"fe2b1182-c80e-9b94-ab0b-2e89cf108aa7"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-f93d82cb-1798-9a0d-8974-bda0dd63c72d","request_id":"f93d82cb-1798-9a0d-8974-bda0dd63c72d"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': 'data: {"error":{"code":"invalid_parameter_error","param":null,"message":"\'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error"},"id":"chatcmpl-b5af6440-0002-9259-be39-54f1f32b78a6"}\n\n', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': 'data: {"error":{"code":"invalid_parameter_error","param":null,"message":"\'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error"},"id":"chatcmpl-a46ef355-3a9c-9d65-9a2b-2799515bf974"}\n\n', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': 'data: {"error":{"code":"invalid_parameter_error","param":null,"message":"\'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error"},"id":"chatcmpl-136e1010-def0-9b03-93b0-75a4f0a8497e"}\n\n', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': 'data: {"error":{"code":"invalid_parameter_error","param":null,"message":"\'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error"},"id":"chatcmpl-5b00da59-c1ef-91b6-a749-9619a87607ff"}\n\n', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': 'data: {"error":{"code":"invalid_parameter_error","param":null,"message":"\'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error"},"id":"chatcmpl-ad34e31a-4af6-9f16-bc29-8d5d5206fdfd"}\n\n', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': 'data: {"error":{"code":"invalid_parameter_error","param":null,"message":"\'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error"},"id":"chatcmpl-85a5d847-5710-92e4-b231-783430a346e8"}\n\n', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-4fede31a-2b74-9a99-83b4-bd290db471ed","request_id":"4fede31a-2b74-9a99-83b4-bd290db471ed"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-2c236e46-4b4b-94b5-a8b8-6c590c3e2baa","request_id":"2c236e46-4b4b-94b5-a8b8-6c590c3e2baa"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-fdae6cf9-9e0b-9eea-95de-6b83c988dc33","request_id":"fdae6cf9-9e0b-9eea-95de-6b83c988dc33"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-f238b70b-a0af-9413-9307-85ab35267f30","request_id":"f238b70b-a0af-9413-9307-85ab35267f30"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-366815ce-e7f8-9415-81b8-d85ba37513b5","request_id":"366815ce-e7f8-9415-81b8-d85ba37513b5"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-a6143c92-ff49-95b4-bba1-5282d7b4b513","request_id":"a6143c92-ff49-95b4-bba1-5282d7b4b513"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
```
Name: John Doe
Email: johndoe@company.com
Phone: 555-9876
```
**Reasoning:**
| Field | Base | Branch Change | Main Change | Resolved |
|-------|------|---------------|-------------|----------|
| **Email** | `john@example.com` | `john@company.com` (updated domain) | `johndoe@personal.com` (updated username + domain) | `johndoe@company.com` |
| **Phone** | `555-1234` | *unchanged* | `555-9876` | `555-9876` |
- **Phone:** The branch made no change, so main's update (`555-9876`) is accepted cleanly.
- **Email:** Both sides modified the email from the base. To produce the *most complete* result, the changes are merged:
- **Username** `johndoe` from main's more specific update (`john` → `johndoe`).
- **Domain** `company.com` from the branch, which takes precedence as the top-most applied change in a rebase (domain `example.com` → `company.com`).
- Combined: `johndoe@company.com`
This resolution preserves every intentional change from both branches without data loss.
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-0aeba386-f3b3-929a-8c06-5815f526b689","request_id":"0aeba386-f3b3-929a-8c06-5815f526b689"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
(empty output)
JSON Schema
Structured Output
Failure: Error code: 400 - {'error': {'message': 'Provider returned error', 'code': 400, 'metadata': {'raw': '{"error":{"message":"<400> InternalError.Algo.InvalidParameter: \'messages\' must contain the word \'json\' in some form, to use \'response_format\' of type \'json_object\'.","type":"invalid_request_error","param":null,"code":"invalid_parameter_error"},"id":"chatcmpl-55808b32-0ff3-9170-8708-2ced82a88dc7","request_id":"55808b32-0ff3-9170-8708-2ced82a88dc7"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
(raw) { "resolved_content": "" }
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) { "resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876" }
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876<|end_message|>
Failure: Content mismatch: ['contact.txt']
Invalid JSON. Output: Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876{
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876"
}
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Invalid JSON. Output: Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Invalid JSON. Output: Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Invalid JSON. Output: Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Invalid JSON. Output: Name: John Doe
Email: johndoe@personal.com
Phone: 555-9876{
"resolved_content": "Name: John Doe\nEmail: johndoe@personal.com\nPhone: 555-9876\n"
}
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {
"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"
}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
JSON Schema
Structured Output
(raw) {"resolved_content": "Name: John Doe\nEmail: john@company.com\nPhone: 555-9876\n"}
Failure: Content mismatch: ['contact.txt']
Name: John Doe
Email: john@company.com
Phone: 555-9876
Failure: Content mismatch: ['contact.txt']
(empty output)
JSON Schema
Structured Output
Failure: Connection error.
Invalid JSON. Output:
JSON Schema
Structured Output
Structured Output Error
Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)
Failure: Failed to parse structured JSON response: Expecting value: line 1 column 1 (char 0)