>>Okay, but that's an issue with planning and not a flaw in Git, correct?
>Yes, but, many people hear "Git will solve all your merge issues" and believe
>it. I heard many people say pretty much that in my sessions.

I've heard Linus talk about merge conflicts. They are fairly easily resolvable he says. And they don't happen often. In fact, as I understand it, they're quite rare on the Linux kernel at least. Linus spends a couple hours per day with all of the 1000s of lines of code changes per day. It's nearly an automated process by now.

>It's absolutely not true.

I've used git since 2011. The only issues I've ever had are sync issues where I needed to pull before pushing to the "central respository". However, in the distributed git model where people can push and pull against each other on a branch, it's never been an issue. I haven't pushed git very far. My experiences may be insufficient.

I can say that with SVN (which CodeLite uses, a Linux-based IDE I use), I have continuous issues with it.

>Git will solve many merge issues that exist with SVN, TFS, and other VCS.
>But, it will not solve all the problems. And I never said it was a flaw with
>Git. I said, Git won't solve all the problems.

I think such an issue is extremely minor especially when Git handles everything else so amazingly. Worse cast scenario, some manual intervention for the fringe merge conflict cases which arise.