Add worktree merge conflict handling

go-git/go-git

Passed 169 steps$0.88164k tokens

Loading run artifacts…