Stephen Leake <[EMAIL PROTECTED]> writes: > A related issue is whether 'bzr-pull' should be on the menu; is it > ever appropriate to run 'bzr pull' rather than 'bzr merge --pull'?
$ bzr pull means "make my local branch a mirror of the remote". Typically, I have a mirror of Stefan's branch, and I use "bzr pull" in it. $ bzr merge means : take the remote changes, and incoporate them in my local tree. I'll commit them afterwards. That's typically usefull when you have a topic branch, and you want to give it a global commit message in your main branch. $ bzr merge --pull will also take the remote changes, but depending on the shape of history, will end up like a pull (several commits added to your local branch), or a merge (a set of commits, that you'll have to commit as a "merge commit"). There are use-cases and good reasons for the 3 of them. -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
