← Back to team overview

ubuntu-manual team mailing list archive

Branching error?

 

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?

Follow ups