简体繁体 English

在本地使用 Git 然后合并并签入 StarTeam

[英]Using Git Locally then merging and checking into StarTeam

原文 2011-07-06 04:59:44 2 1 git/ git-workflow

My client currently requires us to use StarTeam for checking in our code changes.我的客户目前要求我们使用 StarTeam 来检查我们的代码更改。 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.我想从 StarTeam 中提取所有代码并设置一个本地 Git 存储库，以便我可以利用分支来对某些 JQuery 模块进行一些升级。 Does anyone have any suggestions or advice on using a local Git Repository then checking in changes to a StarTeam server?是否有人对使用本地 Git 存储库然后签入对 StarTeam 服务器的更改有任何建议或建议？

1 个解决方案

I would go a bit like git-svn does that kind of workflow:我会 go 有点像git-svn做那种工作流程：

import in a Git repo, in the master branch在master分支中的 Git 存储库中导入
make all the branches from there, but never committing anything to master从那里制作所有分支，但从不提交任何东西来master
make all the merges between branches other than master (again, the master branch is supposed to reflect the StartTeam server latest import)进行除 master 以外的所有分支之间的合并（同样， master分支应该反映 StartTeam 服务器的最新导入）
when ready to go back to StartTeam:当准备好 go 回到 StartTeam 时：
- first update master (with the latest from StartTeam)第一次更新master （来自 StartTeam 的最新版本）
- then merge my work back to the master branch然后将我的工作合并回master分支
- use the content of that master branch as a source to reimport in StartTeam (meaning at this point, master will again represents StarTeam content)使用该 master 分支的内容作为源在 StartTeam 中重新导入（意味着此时， master将再次代表 StarTeam 内容）