<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
Thanks, Mark, that fixed it. Will do a pull request in the future.<br>
<br>
Greg<br>
<br>
<br>
<div class="moz-cite-prefix">Mark Webb-Johnson wrote:<br>
</div>
<blockquote type="cite"
cite="mid:05CEB904-24F5-4FE4-9BC5-D708733CC354@webb-johnson.net">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
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=""
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=""> 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=""
moz-do-not-send="true">OvmsDev@lists.teslaclub.hk</a><br
class="">
<a class="moz-txt-link-freetext" href="http://lists.teslaclub.hk/mailman/listinfo/ovmsdev">http://lists.teslaclub.hk/mailman/listinfo/ovmsdev</a><br
class="">
</div>
</blockquote>
</div>
<br class="">
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
OvmsDev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:OvmsDev@lists.teslaclub.hk">OvmsDev@lists.teslaclub.hk</a>
<a class="moz-txt-link-freetext" href="http://lists.teslaclub.hk/mailman/listinfo/ovmsdev">http://lists.teslaclub.hk/mailman/listinfo/ovmsdev</a>
</pre>
</blockquote>
<br>
</body>
</html>