4 years ago I began using GIT as my primary source repository system, instead of TFS, which I'd been using since 2006.
after 4 years, I can honestly, and fairly, say GIT is a hot pile of shit that can't begin to approach even a fraction of the power and usability of TFS.
I can also say that TFS is dead and will never come back and so I will be cast into the Torvald's coding purgatory (actually HELL) for the remainder of my programming career.
@XSGeek - "Oh hey, I need to edit this file real quick. But Ted checked it out. and he's on vacation. Who's got his login?"
@XSGeek - ^^ Actual conversation that happened every 3 weeks in any given source safe shop.
@XSGeek - I think I repressed those memories.
Off to call the therapist now.
@XSGeek - ah... tooling - IntelliJ (Jet-Brains) has a pretty good automerge built in.
I've also used https://www.sourcetreeapp.com/ to some success.
@XSGeek - having jumped from subversion to git - I have to say, git is better, but poorly implemented. But there is enough tooling around it that works around 95% of awkward use cases. I never used TFS, or any other microsoft code repo after it's VCS-based one (which did deserve to be forgotten)