Add worktree merge conflict handling

go-git/go-git

Passed 98 steps$0.4177k tokens

Loading run artifacts…