Add worktree merge conflict handling

go-git/go-git

Failed 94 steps$2.60107k tokens

Loading run artifacts…