I’ve tried pulling manually. See if that fixes it.

Best way, in general, is for you to send a pull request to us. That way we see the changes you want to incorporate and can merge them in simply.

Regards, Mark.

On 30 Jan 2018, at 10:58 AM, Greg D. <gregd2350@gmail.com> wrote:

Not the PC - it's fine, and in symc with my fork on Github.  It's my fork on Github that says that it's 2 commits ahead.  One of those is an empty remote-tracking commit from the last fetch; the other is the c_str() change to the v2 server...  Did you actually sync my fork to Master, or just make the same changes locally?

Same changes, I guess, but if my fork isn't formally sync'd, I seem to keep accumulating those remote tracking commits, which becomes rather annoying.  Should I be pushing directly to Master instead?  (It's admittedly safer to not change this...).

Greg

Mark Webb-Johnson wrote:

git diff, or git diff —staged, should tell you.

On 30 Jan 2018, at 8:34 AM, Greg D. <gregd2350@gmail.com> wrote:

Hi Mark,

Looks like that did it.  No more disconnects.  Yea!  The verbose logging is good now, too.

Greg

p.s.  Just curious, why does Git think I'm still one commit ahead of Master?

_______________________________________________
OvmsDev mailing list
OvmsDev@lists.teslaclub.hk
http://lists.teslaclub.hk/mailman/listinfo/ovmsdev

_______________________________________________
OvmsDev mailing list
OvmsDev@lists.teslaclub.hk
http://lists.teslaclub.hk/mailman/listinfo/ovmsdev