Add worktree merge conflict handling

go-git/go-git

Passed 61 steps$11.7286k tokens

Loading run artifacts…