开发者

Using Git Locally then merging and checking into StarTeam

My client currently requires us to use StarTeam for checking in our code changes. I would like to pull all the code down from StarTeam and setup a local Git repository so that I might take advantages of the branching to work on some upgrades of some JQuery modules. Does anyone have any suggestions 开发者_如何学Goor advice on using a local Git Repository then checking in changes to a StarTeam server?


I would go a bit like git-svn does that kind of workflow:

  • import in a Git repo, in the master branch
  • make all the branches from there, but never committing anything to master
  • make all the merges between branches other than master (again, the master branch is supposed to reflect the StartTeam server latest import)
  • when ready to go back to StartTeam:
    • first update master (with the latest from StartTeam)
    • then merge my work back to the master branch
    • use the content of that master branch as a source to reimport in StartTeam (meaning at this point, master will again represents StarTeam content)
0

上一篇:

下一篇:

精彩评论

暂无评论...
验证码 换一张
取 消

最新问答

问答排行榜