I'm the git guy on the team and even I get a bit nervous when having to resolve conflicts or figure stuff out in out branching strategy. 95% of the time I am fi

I'm the git guy on the team and even I get a bit nervous when having to resolve conflicts or figure stuff out in out branching strategy. 95% of the time I am fine and so is the team but it's when things involve many teams and many commits on the same subset of files that things get hairy. I will say this: I find git much better than Microsoft's Team Foundation Server (I know it can be setup to use git now) but I like git overall a lot more. Does anyone think any of the competitors to Git will take off? I hesitate to move to something else because inertia is a thing: all my stuff is on github, the team and all my colleagues at work know it, guides exist for it online, but then again ... if I could master a better tool I could teach everyone... hmm.