Add worktree merge conflict handling

go-git/go-git

Passed 165 steps$1.77129k tokens

Loading run artifacts…