Centralised server with http push

[Marius Kruger]

2008/10/14 Lionel Dricot <zeploum at gmail.com>

> And then, when do I use merge ? What's the difference between pull and
> merge ?
>
Pull is used to update your branch to the latest version in another branch.
It only works if your branch is an older version of the other one, not if
they have diverged. It copies the other branch's revision history as your
own-- the result is that often when you pull, your local branch becomes a
clone of the other one.
Merge applies the changes made in another branch to your source file
directory. It doesn't require your branch to be an older version of the
other, though automatic merging requires that the branches be related in
some way. It does not affect revision history, and combines your changes
with the other branch's changes, usually producing a new tree state that has
never existed before.

(http://bazaar-vcs.org/FAQ#head-73f0b8ea8515a0087ce8705fbaafc55c80a0a30e)

I think we need to add a "What is the difference between pull and update?"
anybody?


this might help too:
http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#team-collaboration-central-style



>
>
> PS : thanks a lot for your answer, it's really helpful !
>
glad to hear that.

regards
marius
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20081014/5c13ef09/attachment.htm