You should revert the file - you rarely need to check .leo files in. bzr revert leo/plugins/leoPluginsRef.leo bzr ci
After which, you can add your own mods manually if you really want them uploaded. On Sat, Apr 9, 2011 at 10:40 PM, VR <[email protected]> wrote: > Hello everyone, > > is there a recommended best practice on how to resolve a bzr > merge conflict in "leo/plugins/leoPluginsRef.leo" ? > > As additional information here is my leo log pane: > > <log> > > Leo Log Window > Leo 4.8 final, build 3752, November 26, 2010 > Python 2.7.1, qt version 4.7.1 > Windows 6, 1, 7601, 2, Service Pack 1 > leoID=VR20100603 (in D:\Users\Viktor Ransmayr\.leo) > load dir: D:\Branches\leo-editor\leo\core > global config dir: D:\Branches\leo-editor\leo\config > home dir: D:\Users\Viktor Ransmayr > reading settings in D:\Branches\leo-editor\leo\config\leoSettings.leo > reading settings in D:\Users\Viktor Ransmayr\.leo\myLeoSettings.leo > reading settings in D:\Users\Viktor Ransmayr\Documents\WL2011.leo > > </log> > > Thanks in advance for your recommendations. > > With kind regards, > > VR > > PS: I know I could but I do not want to go the easy route with > 'bzr branch lp:leo-editor' another time .... > > -- > You received this message because you are subscribed to the Google Groups > "leo-editor" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/leo-editor?hl=en. > > -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en.
