Answering questions from Emacs developers.

[Robert Collins]

On Tue, 2009-12-01 at 23:27 +0100, Ali Sabil wrote:
> 
> 
> Maybe it would be good to explain in the wiki the difference between a
> pull and a merge,
> and maybe suggest the usage of bzr merge --pull instead of a plain bzr
> merge ? 

Maybe, but also see 'http://robey.lag.net/2009/11/29/more-git.html',
where Robey advocates doing actual merges (for the same reason Bzr does,
unsurprisingly :)).

-Rob

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20091202/6e2be801/attachment.pgp