Add worktree merge conflict handling

go-git/go-git

Passed 164 steps$21.30365k tokens

Loading run artifacts…