Re: The trunk should be stable again

2017-01-28 Thread Edward K. Ream
On Sat, Jan 28, 2017 at 6:57 AM, lewis wrote: > All fixed with: > *git --reset --hard origin* > ​Excellent. This is a good tip. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails fr

Re: The trunk should be stable again

2017-01-28 Thread lewis
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 b

Re: The trunk should be stable again

2017-01-25 Thread lewis
Usually my leo repository shows as /n/git/leo-editor (master) not /n/git/leo-editor (master|MERGING) OK I read up on *git checkout --theirs* and tried it out. You can see from the git log I did a *git reset --hard* *and I am back to where I started.* git log: lewis@Argon MINGW64 /n/git/leo-ed

Re: The trunk should be stable again

2017-01-25 Thread 'Terry Brown' via leo-editor
17 4:24 PM Subject: Re: The trunk should be stable again 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%

Re: The trunk should be stable again

2017-01-25 Thread lewis
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 + 4b5b7440

Re: The trunk should be stable again

2017-01-25 Thread Edward K. Ream
On Wednesday, January 25, 2017 at 11:12:21 AM UTC-6, Edward K. Ream wrote: I am now a bit more comfortable with branches. > This is a great page about git branches. Follows "The less said the better"

Re: The trunk should be stable again

2017-01-25 Thread Edward K. Ream
On Wednesday, January 25, 2017 at 9:44:19 AM UTC-6, Edward K. Ream wrote: > > The fixes were minor, and the new colorizer code now resides in a branch. > I am now a bit more comfortable with branches. I'll certainly do all the next colorizer work in a branch. I've learned a lot about Leo's colo

The trunk should be stable again

2017-01-25 Thread Edward K. Ream
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. Let the wild rumpus start! Edward -- You received this message because you are subscri