TFS did it again! Merged changes into something that doesn't build! So I had to undo my changes and lost an hour of work. Isn't the whole purpose of TFS to enable teams to work with the same code concurrently?

Although I think TFS is a pile of crap, this can happen with any other concurrent versioning system.
A versioning system has to keep track of the changes, it does not check the code.
It may help you with automatic merges, but you are responsible to check whether the result is correct and take actions if it is not.

Just analyze the changes that were made before yours and adapt what's necessary. No need to lose anything.

https://visualstudio.com/en-us/...

Microsoft added git support to TFS for a reason.

@ItsNotMyFault Sounds great. I have a confession to make: I've never used github... Until the other day that I signed up just to be able to report bugs etc. in devrant.

You can set a rule on TFS so it won't allow check in of code that doesn't build.

@LynxMagnus
This wasn't the issue. We always check that it builds manually, and both of us checked in fully working versions - which just got fucked up by TFS.

But anyway, out of curiosity, how? Is this something I can do myself or is it done somewhere server-side so that only, in our case, the system architect can do it?

@TerriToniAX depends on the permissions you have to the project but you can either set it through visual studio in the team menu and set the check in policy, or you can set it through the web portal in the configuration menu.