Add worktree merge conflict handling

go-git/go-git

Passed 99 steps$15.11162k tokens

Loading run artifacts…