Add worktree merge conflict handling

go-git/go-git

Passed 157 steps$0.48152k tokens

Loading run artifacts…