Add worktree merge conflict handling

go-git/go-git

Passed 107 steps$2.8491k tokens

Loading run artifacts…