Bazaar 的正确命令?
我在弄清楚要使用哪些 Bazaar 命令时遇到了一些困难...
假设我在同名文件夹中有一个名为“test”的本地分支:
- 当我最初获得该分支时,我输入:
cd test bzr pull lp:project_name
- 要提交本地更改,我输入:
bzr commit -m "message"
我对这些命令没有任何问题。
这是我感到困惑的地方:
- 如何将更改推送到 Launchpad?我猜是
bzr Push
但这不会覆盖其他贡献者的更改吗? - 如何更新我的本地分支机构?我猜是
bzr pull
,但这不会覆盖我的更改吗?
每种情况下正确的命令是什么?
I am having some difficulty figuring out which Bazaar commands to use...
Suppose I have a local branch named "test" in a folder of the same name:
- When I initially get the branch, I type:
cd test bzr pull lp:project_name
- To commit local changes, I type:
bzr commit -m "message"
I have no trouble with those commands.
Here is where I get confused:
- How do I push changes to Launchpad? I'm guessing
bzr push
but doesn't that overwrite other contributors' changes? - How do I update my local branch? I'm guessing
bzr pull
, but doesn't that overwrite my changes?
What are the proper commands in each case?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
bzr Push
不会覆盖其他更改。它已经被其他人推送了更改,它会停止并告诉您需要先合并。所以基本上,只有当您包含推送位置的更改时,您才能推送。与 bzr pull 类似,它从该位置获取。但是,您已经提交了本地工作,它会停止并要求您使用
bzr merge
。bzr push
won't overwrite other changes. It already someone else has pushed it changes it will stop and tell you that you need to merge first. So basically you can only push when you have included the changes from the push-location.Similar with
bzr pull
it takes from the location. However you already local work committed, it will stop and ask you to usebzr merge
.