Add worktree merge conflict handling

go-git/go-git

Passed 110 steps$0.4882k tokens

Loading run artifacts…