Add worktree merge conflict handling

go-git/go-git

Passed 27 steps$3.9431k tokens

Loading run artifacts…