Hello Edward, Am Freitag, 1. November 2013 14:15:32 UTC+1 schrieb Edward K. Ream: > > On Wed, Oct 30, 2013 at 4:53 PM, Viktor Ransmayr > <[email protected]<javascript:> > > wrote: > >> Hello Edward, >> >> When I tried to update to the latest version of Leo I received the >> following conflict: >> [snip] >> > > Text conflict in leo/doc/LeoDocs.leo > Auf 1 Konflikte gestoßen. > Now on revision 6202. > > Presumably you modified LeoDocs.leo. >
NO (and possibly yes ;-) As I stated in my initial post I re-created the 'Leo documentations' on my local computer *** without *** making any modifications myself ... > Several ways to recover: > > - bzr revert > - bzr pull --overwrite. > > If those don't work, you may need to pull a new branch > I have created a *new* snapshot from 'bzr branch' - and - will report my future findings ... With kind regards, Viktor -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/groups/opt_out.
