Remote Merge

[Robert Collins]

On Thu, 2005-10-27 at 11:43 -0500, John A Meinel wrote:
> 
> With your last command, are you trying to merge you changes into the
> remote branch, or merge the remote branch changes into the local one? 

Adding to Johns reply, if you are trying to push your committed changes
up, have a look in the arch-pqm (soon to be renamed to 'PQM') bzr
support - it has machinery to do exactly :
branch
merge and commit
push.

in an automated process.

Cheers,
Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051027/6479acba/attachment.pgp