schooltool-developers team mailing list archive

[Gediminas Paulauskas <menesis@xxxxxx>]

Hi,

you happened to pull what I later reverted. Just do bzr pull --overwrite

2012/10/31 Douglas Cerna <douglascerna@xxxxxxxxx>:
> Gediminas:
>
> I tried to update Jeffrey's branch of lp:scholtool and I got an error saying the branches have diverged. I haven't touched anything in that branch, so I don't understand the issue.
>
> Here's the output of "bzr missing" and "bzr info":
>
> http://pastebin.com/7qyPRDFi
>
> Maybe something changed in rev 3498 in a weird way?
>
> Could you recommend me a way to fix it?
>
> Thanks.
>
> Douglas
>
> "... allí­ es cuando te das cuenta que las cosas malas pueden resultar bastante buenas..." - Lionel Messi
>
> Por favor, evite enviarme adjuntos de Word, Excel o PowerPoint.
> Vea http://www.gnu.org/philosophy/no-word-attachments.es.html
>
> _______________________________________________
> Mailing list: https://launchpad.net/~schooltool-developers
> Post to     : schooltool-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~schooltool-developers
> More help   : https://help.launchpad.net/ListHelp



-- 
Gediminas