You can try to bzr uncommit until the point where it you can bzr pull That is one way, then commit and push.
Jon On Mon, Jun 20, 2011 at 10:07 AM, Roger Martín <[email protected]> wrote: > Hi folks! > i've finished some improvements over widgets.php but i can't push them. bzr > pull give me this error: > > bzr: ERROR: These branches have diverged. Use the missing command to see > how. > Use the merge command to reconcile them. > > What am i doing bad? how can correct these problem? > > _______________________________________________ > Mailing list: https://launchpad.net/~aikiframework-devel > Post to : [email protected] > Unsubscribe : https://launchpad.net/~aikiframework-devel > More help : https://help.launchpad.net/ListHelp > > -- Jon Phillips http://rejon.org/ | http://fabricatorz.com/ chat/skype: kidproto | irc: rejon +1.415.830.3884 (global) | +1-510-499-0894 (sf) +86-187-1003-9974 (beijing) _______________________________________________ Mailing list: https://launchpad.net/~aikiframework-devel Post to : [email protected] Unsubscribe : https://launchpad.net/~aikiframework-devel More help : https://help.launchpad.net/ListHelp
