Add worktree merge conflict handling

go-git/go-git

Failed 173 steps$0.66144k tokens

Loading run artifacts…