在本地使用Git,然后合并并检入StarTeam [英] Using Git Locally then merging and checking into StarTeam
本文介绍了在本地使用Git,然后合并并检入StarTeam的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!
问题描述
我的客户目前要求我们使用StarTeam来检查我们的代码更改。我想从StarTeam中取出所有代码并设置一个本地Git存储库,以便我可以利用分支来处理某些JQuery模块的某些升级。有没有人对使用本地Git存储库有任何建议或建议,然后检查对StarTeam服务器的更改?
解决方案
我会有点像 git-svn
工作流程:
- 在Git仓库中导入
master
分支 li>
- 创建所有分支,但从未向
master
- 提交所有合并在master之外的分支之间(同样,
master
分支应该反映StartTeam服务器的最新导入) - 准备好返回时到StartTeam:
- 第一次更新
master
(使用StartTeam的最新版本) > - 然后将我的工作合并回到
master
分支 - 使用作为重新导入StartTeam的源的主分支的内容(此时,
master
将再次表示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 or 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)
- first update
这篇关于在本地使用Git,然后合并并检入StarTeam的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!
查看全文