Add worktree merge conflict handling

go-git/go-git

Passed 179 steps$6.72140k tokens

Loading run artifacts…