When I ran 'git pull' I got this message: $ git pull remote: Counting objects: 85, done. remote: Compressing objects: 100% (54/54), done. remote: Total 85 (delta 59), reused 57 (delta 31), pack-reused 0 Unpacking objects: 100% (85/85), done. >From git://github.com/leo-editor/leo-editor + 4b5b74408...4efb5f58a master -> origin/master (forced update) * [new branch] color -> origin/color
*** Please tell me who you are. So I logged in and retried $ git pull Auto-merging leo/test/unitTest.leo CONFLICT (content): Merge conflict in leo/test/unitTest.leo Auto-merging leo/core/leoColorizer.py CONFLICT (content): Merge conflict in leo/core/leoColorizer.py Auto-merging leo/core/commit_timestamp.json CONFLICT (content): Merge conflict in leo/core/commit_timestamp.json Automatic merge failed; fix conflicts and then commit the result. Any tips from here? Thanks Lewis *On Thursday, January 26, 2017 at 2:44:19 AM UTC+11, Edward K. Ream wrote:* > > > > > > *The fixes were minor, and the new colorizer code now resides in a > branch.Still, even a few hours of badness isn't exactly the best advert for > using the git repo.Let me know if there are further problems.* > -- 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.
