NAV ALM with Team Foundation Server | Merge Strategy

With my branch strategy post, I have provided you with a basis to design a source control structure to store your code in TFS. However, this is just half the story when it comes to how to keep the various branches in sync to the right extend. So here comes in the merge part of the strategy, i.e. the “what about all those FI and RI arrows going up and down?” question I left hanging in the air at the end of my branch strategy post.