Add worktree merge conflict handling

go-git/go-git

Passed 67 steps$15.62122k tokens

Loading run artifacts…