Add worktree merge conflict handling

go-git/go-git

Passed 149 steps$0.48183k tokens

Loading run artifacts…