> This sounds like you need "iMerge". TBH, I have no idea why these conflicts appear at all. As the branch exists already, all conflicts are solved and part of the repository.
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.