Creating partial branches in TFS

One of the less known features in TFS is the ability to create partial branches. A partial branch is where you create a branch with only a set of subtrees of the source branch. There are a number of reasons why you might want to do it, including saving disk space on the server, saving…

0

Resolving merge content conflicts as KeepYours / AutoMerge

I get this question, fairly often “I just merged from Trunk -> Branch, resolved all conflicts and checked in. I now merge from Branch -> Trunk, and there are no changes in trunk, so I expect no conflicts, but I get conflicts – why?”. The short answer is you will get conflicts on any files you had conflicts on…

0