Hey there...any bzr experts among us?  I'm getting an error.  When I try:

bzr pull lp:ubuntu-manual


...this is what I'm getting:

bzr: ERROR: These branches have diverged. Use the missing command to see
> how.
> Use the merge command to reconcile them.


Any safe way to reconcile this problem?
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-manual
Post to     : ubuntu-manual@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-manual
More help   : https://help.launchpad.net/ListHelp

Reply via email to