We have a very large set of projects and two build servers. This some times cause conflicts in TFS where one server is building while the other one checks in a common file. We've seen errors on both getting and checking in. Our current fix is to manaully reslove the conflict on the out dated build server.
I've been looking into what we can do with the TFS command line tools since I can't seem to find anything here about TF resolve command/actions.
http://msdn.microsoft.com/en-us/library/6yw3tcdy.aspx
Is there anything builtin to FB to handle this or plans in the future for it?