Invoke-ForwardIntegration

SYNOPSIS

Syncs all changes from TFS server paths mapped to the VolatileEnlistment with the partial branch and local git repository.

SYNTAX

Invoke-ForwardIntegration [<CommonParameters>]

DESCRIPTION

This function performs the following operations:
  • TF undo . /r from the Volatile workspace removing any pending changes (there should not be any since this is not where you work.)
  • TF GET from the Volatile workspace
  • TF undo . /r from the Partial Branch workspace removing any pending changes (there should not be any since this is not where you work.)
  • TF GET from the Partial Branch workspace
  • TF Merge <Volatile Server Branch> <Partial Branch> /r
  • commits the above merge
  • stashes any pending changes in git repo
  • checks out master git branch
  • git-tf pull from the git repo

If there are any merge conflicts in the TFS merge, you may be prompted to oresolve them. However, if you do all of your work in the git repo, this should not happen.


Last edited Jan 14, 2013 at 6:14 AM by mwrock, version 1

Comments

No comments yet.