Add worktree merge conflict handling

go-git/go-git

Passed 28 steps$3.9230k tokens

Loading run artifacts…