<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">I’ve tried pulling manually. See if that fixes it.<div class=""><br class=""></div><div class="">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.</div><div class=""><br class=""></div><div class="">Regards, Mark.<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On 30 Jan 2018, at 10:58 AM, Greg D. <<a href="mailto:gregd2350@gmail.com" class="">gregd2350@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class="">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" class="">
<div text="#000000" bgcolor="#FFFFFF" class="">
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?<br class="">
<br class="">
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...).<br class="">
<br class="">
Greg<br class="">
<br class="">
<br class="">
<div class="moz-cite-prefix">Mark Webb-Johnson wrote:<br class="">
</div>
<blockquote type="cite" cite="mid:32A9D95D-7B4D-401E-8CCA-F94F555D825A@webb-johnson.net" class="">git
diff, or git diff —staged, should tell you.<br class="">
<div class=""><br class="">
<blockquote type="cite" class="">
<div class="">On 30 Jan 2018, at 8:34 AM, Greg D. <<a href="mailto:gregd2350@gmail.com" class="" moz-do-not-send="true">gregd2350@gmail.com</a>> wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<meta http-equiv="Content-Type" content="text/html;
charset=UTF-8" class="">
<div text="#000000" bgcolor="#FFFFFF" class=""> Hi Mark,<br class="">
<br class="">
Looks like that did it. No more disconnects. Yea! The
verbose logging is good now, too.<br class="">
<br class="">
Greg<br class="">
<br class="">
p.s. Just curious, why does Git think I'm still one
commit ahead of Master?<br class="">
</div>
</div>
</blockquote>
</div>
</blockquote>
<br class="">
</div>
_______________________________________________<br class="">OvmsDev mailing list<br class=""><a href="mailto:OvmsDev@lists.teslaclub.hk" class="">OvmsDev@lists.teslaclub.hk</a><br class="">http://lists.teslaclub.hk/mailman/listinfo/ovmsdev<br class=""></div></blockquote></div><br class=""></div></body></html>