Add worktree merge conflict handling

go-git/go-git

Passed 155 steps$5.96129k tokens

Loading run artifacts…