I think this happened at 210. My local branch is 210 which I pushed to
LP, put the LP 210 is a different commit, my last commit is not logged
on LP.
I don't know what happened I pushed as normal. Anyway I've pull the
current branch with --overwrite and re-committed the changes.
Kelvin
Ryan Macnish wrote:
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
------------------------------------------------------------------------
Get straight to the Point Find a great deal on your next car.
<http://clk.atdmt.com/NMN/go/157637060/direct/01/>
------------------------------------------------------------------------
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-manual
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ubuntu-manual
More help : https://help.launchpad.net/ListHelp
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-manual
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ubuntu-manual
More help : https://help.launchpad.net/ListHelp
