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. It's absolutely not true. 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.

>Okay, but that's an issue with planning and not a flaw in Git, correct?