Single-line version number conflict
Tests ability to resolve a version number conflict during cherry-pick. Evaluates handling of semantic versioning clashes between branches.
Baseline Repository
These commands set up the repo before the model sees the prompt. They define the starting file structure, staged changes, and Git history.
- 01
git init - 02
git config user.email 'test@test.com' - 03
git config user.name 'Test User' - 04
echo 'VERSION=1.0.0' > version.txt - 05
git add version.txt - 06
git commit -m 'Initial version' - 07
git checkout -b release - 08
echo 'VERSION=2.0.0' > version.txt - 09
git add version.txt - 10
git commit -m 'Bump major version' - 11
git checkout main - 12
echo 'VERSION=1.1.0' > version.txt - 13
git add version.txt - 14
git commit -m 'Bump minor version' - 15
git cherry-pick $(git rev-parse release)
Prompt
Resolve the cherry-pick conflict in version.txt. The base version was 'VERSION=1.0.0'. The incoming commit (release) changed it to 'VERSION=2.0.0'. The current branch (main) has 'VERSION=1.1.0'. Provide ONLY the resolved file content.
Expected
VERSION=2.0.0
Fixture Metrics
Scoped model quality, cost, API time, and token usage for cherry_pick/f002.
Loading...
Raw Attempt Evidence
Loading raw attempt evidence…
Model Outputs (546)
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
```
VERSION=2.0.0
```
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
```
VERSION=2.0.0
```
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
```
VERSION=2.0.0
```
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
```
VERSION=2.0.0
```
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
```
VERSION=2.0.0
```
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
version.txt
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
JSON Schema
Structured Output
(raw)
{
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
```
VERSION=2.0.0
```
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0\n" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
--- version.txt
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "--- version.txt\nVERSION=2.0.0\n"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0\n" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) { "resolved_content": "VERSION=2.0.0" }
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
```
VERSION=2.0.0
```
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0\n"
}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.0.0"
}
VERSION=2.0.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.0.0"}
```
VERSION=2.0.0
```
**Reasoning**: The incoming commit from the release branch intentionally bumps to a major version (2.0.0). Since this is an explicit release commit being cherry-picked with the message "Bump major version," accepting the incoming change (2.0.0) respects the intent of the cherry-pick operation.
Failure: Content mismatch: ['version.txt']
```
VERSION=2.0.0
```
The incoming commit from the release branch represents an intentional major version bump that should take precedence over the incremental minor version change in main.
Failure: Content mismatch: ['version.txt']
```
VERSION=2.0.0
```
**Reasoning:** When cherry-picking a commit explicitly titled "Bump major version" from the release branch, the intended change (incrementing to 2.0.0) should be accepted. The incoming commit represents the deliberate versioning decision being cherry-picked, so accepting it (resolving to the incoming version) is the appropriate resolution.
Failure: Content mismatch: ['version.txt']
```
VERSION=2.0.0
```
**Reasoning:** The cherry-picked commit's intent was to **bump the major version** (as noted in the commit message `Bump major version`). The change `1.0.0 → 2.0.0` represents a deliberate major release. The current branch's `1.1.0` is a minor increment that is superseded by the major version bump to `2.0.0`. Accepting the incoming cherry-picked version is the correct resolution.
Failure: Content mismatch: ['version.txt']
VERSION=2.1.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=2.1.0\n"}
Failure: Content mismatch: ['version.txt']
```
VERSION=2.0.0
```
The incoming release commit's intent is to bump the major version, which supersedes the minor bump on `main`. Resolving to `2.0.0` preserves the purpose of the cherry-picked commit (a major version bump takes precedence over the earlier `1.1.0` minor increment).
Failure: Content mismatch: ['version.txt']
```
VERSION=2.0.0
```
The "Bump major version" commit's intent is a major version increment, which by semantic versioning resets minor and patch to `0`. Applying that intent to `main` (`1.1.0`) yields `2.0.0` — matching the incoming value, so keep it.
Failure: Content mismatch: ['version.txt']
VERSION=2.0.0
Explanation of the resolution:
- **Base:** `1.0.0`
- **Incoming (release commit being cherry-picked):** `2.0.0` — a major version bump
- **Current (main):** `1.1.0` — a minor bump
Since the cherry-picked commit's *intent* is to "Bump major version," and `2.0.0` supersedes `1.1.0` in semantic versioning, keeping `2.0.0` is the correct resolution. The minor bump on main (`1.1.0`) is subsumed by the major release.
If you instead intended to combine both changes (e.g., the release should reflect main's work too), you might want `2.0.0` still — a major bump inherently resets minor/patch, so no version-number merging is needed here.
Failure: Content mismatch: ['version.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)
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)
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)
VERSION=1.1.0
Failure: Content mismatch: ['version.txt']
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0"
}
Failure: Content mismatch: ['version.txt']
VERSION=1.1.0
Failure: Content mismatch: ['version.txt']
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0"
}
Failure: Content mismatch: ['version.txt']
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=1.1.0"}
Failure: Content mismatch: ['version.txt']
Invalid JSON. Output: VERSION=2.1.0
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: version.txt
VERSION=2.0.0
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)
VERSION=2.0.0
Failure: Content mismatch: ['version.txt']
VERSION=2.0.0
Failure: Content mismatch: ['version.txt']
VERSION=2.0.0
Failure: Content mismatch: ['version.txt']
VERSION=2.0.0
Failure: Content mismatch: ['version.txt']
VERSION=2.1.0
JSON Schema
Structured Output
(raw) {"resolved_content": "VERSION=2.1.0"}
Failure: Content mismatch: ['version.txt']
VERSION=2.1.0
Failure: Content mismatch: ['version.txt']
(empty output)
Failure: OpenAI-compatible response contained provider error: Provider returned error
>>?? This is …???…? etc…..?.....… ………..uri?……...... ……..……...…??..?????…?……
??—??…,...…..…-…????…???..…?? 보…??...
JSON Schema
Structured Output
(raw) {
"resolved_content"
:
">>?? This is …???…? etc…..?.....… ………..uri?……...... ……..……...…??..?????…?……
??—??…,...…..…-…????…???..…?? 보…??..."
}
Failure: Content mismatch: ['version.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)
VERSION=2.1.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=2.1.0"
}
Failure: Content mismatch: ['version.txt']
VERSION=1.1.0
VERSION=2.0.0
JSON Schema
Structured Output
(raw) {
"resolved_content": "VERSION=1.1.0\nVERSION=2.0.0"
}
Failure: Content mismatch: ['version.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-9ade3a9d-bb62-95ae-ab96-34ec751f574f","request_id":"9ade3a9d-bb62-95ae-ab96-34ec751f574f"}', '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-60986180-7f8a-948c-86f6-60d6198ff48d","request_id":"60986180-7f8a-948c-86f6-60d6198ff48d"}', '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-7e8beecd-7ca8-92b3-8860-1f1ecc5a3ca4","request_id":"7e8beecd-7ca8-92b3-8860-1f1ecc5a3ca4"}', '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-c31fcb96-f865-928e-86e8-aa95d89e41ed","request_id":"c31fcb96-f865-928e-86e8-aa95d89e41ed"}', '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-27b1dc12-4157-9abc-ae19-33a4d41e50a4","request_id":"27b1dc12-4157-9abc-ae19-33a4d41e50a4"}', '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-70dfa960-dec1-92e2-a4c1-867046c72ab0"}\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-64dbce53-a6dc-931d-ae78-7e00604925fd"}\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-6663827e-49b7-99fc-aa5e-f0afb789d443"}\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-d786661c-340f-95f8-9600-f5956b0d46d9"}\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-12dea670-e371-9140-bb38-6c27360786a4"}\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-00172ec7-f5cf-9a8a-8d94-339dd07db736"}\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-54a51cca-1ad9-92a9-88ff-88e66bb9feaa","request_id":"54a51cca-1ad9-92a9-88ff-88e66bb9feaa"}', '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-7d9271d7-f19f-9aa4-94f7-455e2a13b665","request_id":"7d9271d7-f19f-9aa4-94f7-455e2a13b665"}', '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-ee59cccd-4d17-90f3-8772-e1585499a32c","request_id":"ee59cccd-4d17-90f3-8772-e1585499a32c"}', '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-3fa3feb5-823e-936b-b3c9-94940acf27cb","request_id":"3fa3feb5-823e-936b-b3c9-94940acf27cb"}', '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-a44296bc-2c1e-98b3-8d40-abd471501059","request_id":"a44296bc-2c1e-98b3-8d40-abd471501059"}', '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-f6ad447e-f08a-9a1e-b248-ac5212d2a220","request_id":"f6ad447e-f08a-9a1e-b248-ac5212d2a220"}', '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-02288b3a-4f91-9724-878e-b800bd3a77ba","request_id":"02288b3a-4f91-9724-878e-b800bd3a77ba"}', '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-4600760a-1660-902d-b92e-b2f2bab77d33","request_id":"4600760a-1660-902d-b92e-b2f2bab77d33"}', '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-61fe5577-6e79-9326-b111-ce1b7ef1c090","request_id":"61fe5577-6e79-9326-b111-ce1b7ef1c090"}', '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-832d9a96-4582-9082-b4cd-14d44a999766","request_id":"832d9a96-4582-9082-b4cd-14d44a999766"}', 'provider_name': 'Alibaba', 'is_byok': False}}, 'user_id': 'user_3FrVBkmFqVIuZ58dEh7AU8vhXUV'}
Invalid JSON. Output: VERSION=2.0.0{ "resolved_content": "VERSION=2.0.0" }
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: VERSION=2.0.0
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: VERSION=2.0.0
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: VERSION=2.0.0
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: VERSION=2.0.0
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: VERSION=2.0.0{ "resolved_content": "VERSION=2.0.0" }
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)
VERSION=2.0.0
The conflict occurs while cherry-picking the release commit (which intentionally replaces the original 1.0.0 line with 2.0.0) onto main. Because the purpose of the cherry-pick is to bring the release commit’s change across, the resolution accepts the incoming side, leaving only the line VERSION=2.0.0. No other content exists in the file, so that single line is the complete resolved result.
Failure: Content mismatch: ['version.txt']
VERSION=1.1.0
JSON Schema
Structured Output
(raw) {"resolved_content":"VERSION=1.1.0"}
Failure: Content mismatch: ['version.txt']
VERSION=2.1.0
Failure: Content mismatch: ['version.txt']
Invalid JSON. Output: VERSION=2.0.0
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)
VERSION=1.1.0
Failure: Content mismatch: ['version.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)
Invalid JSON. Output: VERSION=2.0.0
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: VERSION=2.0.0
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)