具有两个客户端的 Git svn 工作流程
我使用 git-svn 作为“更好”的 svn 客户端。有时我在家使用笔记本电脑工作，笔记本电脑具有与我的主 PC 的 IP 连接。
在笔记本电脑和主电脑之间移动更改的最佳方式是什么？
例如，我正在修复错误并已在本地分支中提交了一些更改。我希望能够接受这些更改并继续解决我的笔记本电脑上的错误，并在进行更改时提交更改。然后，我希望能够将这些更改移回我的主 PC，并在返回办公室时继续处理错误。
I use git-svn as a 'better' svn client. Sometimes I work from home on my laptop, which has IP connectivity to my main PC.
Whats is the best way to move changes between my laptop and main PC?
For example I am half way though fixing a bug and have commited some changes in a local branch. I'd like to be able to pick these changes up and continue working on the bug on my laptop, and commit changes as I make them. I'd then like to be able to move these changes back to my main PC and continue working on the bug when I return to the office.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
我假设您正在使用 SVN，因为这是您在一天结束时必须在办公室做出的承诺。
在您的家庭 PC 和工作 PC 之间，将存储库视为纯 git 存储库。在不直接“dcommited”到 svn 分支的分支中工作。
由于 git 和 svn 之间的问题，已经必须小心合并到svn 对话分支。不妨解决这个问题，并且只与家庭和办公室的这些分支机构进行镜像。然后挑选或小心地合并到 svn 分支中，然后提交它们。
I am assuming, you are using SVN, because that is what you have to commit to, at the office, at the end of the day.
Between your home PC and work PC, treat the repo as a pure git repo. Work in branches that are not directly "dcommitted" to the svn branch.
Because of the problems between git and svn, which already have to be careful with the merges to the svn-talking branches. Might as well deal with this and only mirror with these branches at home and office. Then cherry-pick or carefully merge into the svn branches to then dcommit them.