Add worktree merge conflict handling
Add worktree merge support with conflict detection, merge head handling, and index stage updates.
Latest localPass
gpt-6-astra · xhigh public4/4 runs passed
claude-opus-5 · max public4/4 runs passed
Run history
Flash-Next IQ3_SDeepSWE · follow-on · 2026-10-12
- Agent time
- 15m 59s
- Feature checks
- 17 / 17
- Regression checks
- 2 / 2
Run settings & provenance
- Run ID
- tonight-20261012-followon/go-git-worktree-merge-conflicts__6DfcCJY
- Model
- qwen3.8-flash-next-iq3_s
- Reasoning effort
- medium
- Requested output allowance
- 196,608
- Temperature
- 1.0
- Top p
- 0.95
- Top k
- 20
- Min p
- 0.0
- Presence penalty
- 0.0
- Repetition penalty
- 1.0
- Agent
- OpenCode/Pier
- Runtime
- Strata 0.1.42
- Agent timeout seconds
- 2,700
Timing, delivery & token accounting
- Timing seconds · Agent execution (seconds)
- 958.982545
- Timing seconds · Environment setup (seconds)
- 29.301627
- Timing seconds · Verifier
- 38.838269
- Usage · Input tokens
- 3,175,660
- Usage · Cached tokens
- 3,111,087
- Usage · Output tokens
- 49,403
- Usage · Peak context tokens
- 101,860
- Usage · Steps
- 48
- Usage · Requests
- 49
- Patch · Bytes
- 39,034
- Patch · SHA256
- 8ba982f0d1cdb57134a0e6d9df9a6d1a0a31e4b01b7cae6466a41817da47516c
- Verification · Status
- official-scored
- Verification · Verifier
- DeepSWE v1.1 official verifier
- Verification · Evidence
- verified campaign state and official verifier result
Published comparisons
Published comparison sources
Published successful attempts using mini-swe-agent on the same task, not matched local runs.
gpt-6-astra · xhigh4/4 passed
Published attempt details
- run attempt
- 1
- outcome
- pass
- passed
- True
- run attempt
- 2
- outcome
- pass
- passed
- True
- run attempt
- 3
- outcome
- pass
- passed
- True
- run attempt
- 4
- outcome
- pass
- passed
- True
claude-opus-5 · max4/4 passed
Published attempt details
- run attempt
- None
- outcome
- pass
- passed
- True
- run attempt
- None
- outcome
- pass
- passed
- True
- run attempt
- None
- outcome
- pass
- passed
- True
- run attempt
- None
- outcome
- pass
- passed
- True
Official assignment
Recorded assignment context
Add worktree merge support with conflict detection, merge head handling, and index stage updates.