Using Git Locally, then Merging and Validating in StarTeam

My client currently requires us to use StarTeam to check our code changes. I would like to remove all the code from StarTeam and install the local Git repository so that I can take advantage of the branching to work on some updates to some jQuery modules. Does anyone have any suggestions or recommendations on using the local Git repository and then checking for changes on the StarTeam server?

+4
source share
1 answer

I would be a bit like git-svn does such a workflow:

  • import to Git repository in master branch
  • make all branches from there, but never oblige master
  • do all the merges between branches other than master (again, the master branch should reflect the last import of the StartTeam server)
  • when you are ready to return to StartTeam:
    • first master update (with the latest from StartTeam)
    • then combine my work with the master branch
    • use the contents of this main branch as the source for reimport in StartTeam (which means that at this point master will again present the contents of StarTeam)
+5
source

All Articles