ubuntu-manual team mailing list archive

[Ryan Macnish <nisshh@xxxxxxxxxxx>]

hey everyone,

I encountered an error message today while trying to pull changes from launchpad for lp:ubuntu-manual, i nutted it out and thought id post the solution here just in case anyone else happens to get this too:

If you get an error message about the branch being diverged on your local machine while running:

bzr pull

just run it with this flag to fix the problem:

bzr pull --overwrite

That flag will overwrite any local changes you have made to the your local copy so be careful when you use it. After you have pulled the changes with that command once you can go back to just using:

bzr pull

This seems to have happened between r210 and r213.

Please email me if you are still having issues.

Ryan Macnish
 		 	   		  
_________________________________________________________________
Find a great deal on your next car. Get straight to the Point.
http://clk.atdmt.com/NMN/go/157637060/direct/01/