Add worktree merge conflict handling

go-git/go-git

Passed 127 steps$17.35157k tokens

Loading run artifacts…