Add worktree merge conflict handling

go-git/go-git

Passed 169 steps$25.83412k tokens

Loading run artifacts…