Re: GitHub merge

2018-07-27 Thread Rob 
Thanks, Terry and Jacob.

Rob...

On Friday, July 27, 2018 at 9:54:55 AM UTC-4, Terry Brown wrote:
>
> Based on looking at `gitk --all` and then perhaps more efficiently `git 
> log --stat`, I'd say what you did had no negative impact beyond perhaps an 
> unnecessary merge commit - i.e. it didn't actually change any files in 
> devel or anywhere else.
>
> Cheers -Terry
>
>
> On Fri, Jul 27, 2018 at 8:04 AM Rob > 
> wrote:
>
>> After returning from an extended trip last night, I tried syncing my 
>> local machine to the latest leo devel branch. I use GitHub Desktop on 
>> Win10. On my end, it appears that I may have unintentionally merged 
>> branches. See screenshot:
>>
>>
>> 
>> I don't know enough about how GitHub operates to know if this is simply a 
>> reflection of something local to my machines or if I managed to screw up 
>> the master code base at Leo (I hope not). And if so, I have no idea how to 
>> fix it. Anyone else seeing this?
>>
>> Rob...
>>
>> -- 
>> 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 leo-editor+...@googlegroups.com .
>> To post to this group, send email to leo-e...@googlegroups.com 
>> .
>> Visit this group at https://groups.google.com/group/leo-editor.
>> For more options, visit https://groups.google.com/d/optout.
>>
>

-- 
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 leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.

Re: GitHub merge

2018-07-27 Thread Terry Brown 
Based on looking at `gitk --all` and then perhaps more efficiently `git log
--stat`, I'd say what you did had no negative impact beyond perhaps an
unnecessary merge commit - i.e. it didn't actually change any files in
devel or anywhere else.

Cheers -Terry


On Fri, Jul 27, 2018 at 8:04 AM Rob  wrote:

> After returning from an extended trip last night, I tried syncing my local
> machine to the latest leo devel branch. I use GitHub Desktop on Win10. On
> my end, it appears that I may have unintentionally merged branches. See
> screenshot:
>
>
> 
> I don't know enough about how GitHub operates to know if this is simply a
> reflection of something local to my machines or if I managed to screw up
> the master code base at Leo (I hope not). And if so, I have no idea how to
> fix it. Anyone else seeing this?
>
> Rob...
>
> --
> 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 leo-editor+unsubscr...@googlegroups.com.
> To post to this group, send email to leo-editor@googlegroups.com.
> Visit this group at https://groups.google.com/group/leo-editor.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
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 leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.

Re: GitHub merge

2018-07-27 Thread Terry Brown 
It is in the main GitHub repo., but I'm not sure if it's doing any harm.
I.e. it might just be merge commit that merges branches that were already
in sync. bar trivial changes.  I'll investigate a bit more.

Cheers -Terry


On Fri, Jul 27, 2018 at 8:04 AM Rob  wrote:

> After returning from an extended trip last night, I tried syncing my local
> machine to the latest leo devel branch. I use GitHub Desktop on Win10. On
> my end, it appears that I may have unintentionally merged branches. See
> screenshot:
>
>
> 
> I don't know enough about how GitHub operates to know if this is simply a
> reflection of something local to my machines or if I managed to screw up
> the master code base at Leo (I hope not). And if so, I have no idea how to
> fix it. Anyone else seeing this?
>
> Rob...
>
> --
> 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 leo-editor+unsubscr...@googlegroups.com.
> To post to this group, send email to leo-editor@googlegroups.com.
> Visit this group at https://groups.google.com/group/leo-editor.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
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 leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.