Branch Management in TFS

Creating a private branch
tf branch $/orchard/trunk $/orchard/branches/private/myalias/trunk 
  • This is a 1 time only thing.
  • This is a local change only until you do a "tf checkin".
Merging from trunk to private
tf merge $/orchard/trunk $/orchard/branches/private/myalias/trunk
  • This is called a "Forward Integration" or "FI".
  • This is a local change only until you do a "tf checkin".
  • You can run this command as many times as you want...
  • but It's better to run it when you have no files checked-out in your private branch, so you can keep a clean history for your changes vs merging/resolving conflicts.
Merging from private to trunk
tf merge $/orchard/branches/private/chrisc/trunk $/orchard/trunk
  • This is called a "Reverse Integration" or "RI".
  • This is a local change only until you do a "tf checkin".
  • You can run this command typically just before creating a shelve set (for review) or checking in a change to the trunk.
  • It is better to do this only after you've done an FI to the private branch, so that conflicts are resolved in your private branch.

Last edited Nov 10, 2009 at 10:58 AM by bradmi, version 2