Add worktree merge conflict handling

go-git/go-git

Passed 208 steps$2.16145k tokens

Loading run artifacts…