Add worktree merge conflict handling

go-git/go-git

Passed 153 steps$0.56133k tokens

Loading run artifacts…