All fixed with: *git --reset --hard origin* On Thursday, January 26, 2017 at 11:25:26 AM UTC+11, lewis wrote: > > Usually my leo repository shows as > /n/git/leo-editor (master) not > /n/git/leo-editor (master|MERGING) > [snip] > You can see from the git log I did a *git reset --hard* *and I am back to > where I started.* >
-- 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 https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
