That's what's trouble: git is reaching the end of its useful life.
It's 25 years old, and the patch files that make up the core of the decentralized collaboration system are fully 50 years old. Have the design requirements and constraints perhaps changed over the last 50 years?
1. Git breaks down if files are too large or lines within files are too large.
2. Add/Rename conflicts will always burn you because git does not protect the intent behind changes.
And really the third is that IDE's are shit because there's no document object model (like the browser has). You have to make an error recovering parser to try to deal with the fact that an IDE is editing code half the time and text half the time. You're stuck playing a game you can't possibly win. Can you imagine if the HTML DOM kept blinking into and out of existence? It'd be a nightmare...
