Add worktree merge conflict handling

go-git/go-git

Passed 102 steps$2.6697k tokens

Loading run artifacts…