<html>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
</head>
<body>
Also, on the general handling for pull requests:<br>
<br>
It's generally advised to create separate branches for all your pull
requests, each concentrating on just a single feature / development
topic.<br>
<br>
You can have local development branches as many as you need. Publish
changes ready to be merged into the dedicated pull request branch
(i.e. merge them locally into that branch), then create a pull
request on that branch.<br>
<br>
Pull requests track the branch they are created on, so any new
commit added during the discussion will automatically update the
pull request.<br>
<br>
Once a pull reqest has been merged into the master, you can simply
delete the branch.<br>
<br>
Regards,<br>
Michael<br>
<br>
<br>
<div class="moz-cite-prefix">Am 17.08.20 um 07:38 schrieb Mark
Webb-Johnson:<br>
</div>
<blockquote type="cite"
cite="mid:5AF77C95-37F0-464F-98FE-E92A128FD99C@webb-johnson.net">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
Yes, ^this.
<div class=""><br class="">
</div>
<div class="">The main repository master should be relatively
stable. If we need something potentially breaking, or a major
restructuring of how things are done, then we should do that in
a main repository branch. That is the reason for the upcoming
3.3 branch (as it restructures the modem driver, which could be
potentially very breaking - more on this later, when I am ready
to release).</div>
<div class=""><br class="">
</div>
<div class="">Preparing stuff for inclusion in the main repository
should in general be done in local clone copies, then
pull-requests made when ready.</div>
<div class=""><br class="">
</div>
<div class="">Regards, Mark<br class="">
<div><br class="">
<blockquote type="cite" class="">
<div class="">On 17 Aug 2020, at 1:08 PM, Soko <<a
href="mailto:ovms@soko.cc" class=""
moz-do-not-send="true">ovms@soko.cc</a>> wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<div class="">PS: On a second thought I kinda cannot see
the advantage of a PR request into a Dev branch in
comparison into the master branch. <br class="">
If the PR is changed and improved until it is approved
by you guys it should be OK to go into the master. <br
class="">
<br class="">
<div class="gmail_quote">On 17 August 2020 07:00:37
CEST, Soko <<a href="mailto:ovms@soko.cc" class=""
moz-do-not-send="true">ovms@soko.cc</a>> wrote:
<blockquote class="gmail_quote" style="margin: 0pt 0pt
0pt 0.8ex; border-left: 1px solid rgb(204, 204,
204); padding-left: 1ex;">
Hi Derek. <br class="">
<br class="">
I would prefer the first option as discussing source
is way easier on a PR in github as here in the
mailing list. <br class="">
<br class="">
Soko<br class="">
<br class="">
<div class="gmail_quote">On 17 August 2020 06:53:40
CEST, Derek Caudwell <<a
href="mailto:d.caudwell@gmail.com" class=""
moz-do-not-send="true">d.caudwell@gmail.com</a>>
wrote:
<blockquote class="gmail_quote" style="margin: 0pt
0pt 0pt 0.8ex; border-left: 1px solid rgb(204,
204, 204); padding-left: 1ex;">
<div dir="auto" class="">Hi Mark,
<div dir="auto" class=""><br class="">
</div>
<div dir="auto" class="">Would it possible to
have a 'Dev' branch in the main repository
for those of us needing assistance to get a
feature to the point it can be merged into
the 'Master'? </div>
<div dir="auto" class=""><br class="">
</div>
<div dir="auto" class="">If that's not
preferred and we use a branch on our own
github clone, is it as simple as providing
the link to the branch on this email list <span
style="font-family:sans-serif" class="">to
invite others to collaborate/review? </span></div>
<div dir="auto" class=""><span
style="font-family:sans-serif" class=""><br
class="">
</span></div>
<div dir="auto" class=""><font class=""
face="sans-serif">With the latter approach
we may miss out on input from others not
actively monitoring this forum I guess.</font></div>
<div dir="auto" class=""><font class=""
face="sans-serif"><br class="">
</font></div>
<div dir="auto" class=""><font class=""
face="sans-serif">Regards Derek </font></div>
</div>
</blockquote>
</div>
</blockquote>
</div>
</div>
_______________________________________________<br
class="">
OvmsDev mailing list<br class="">
<a href="mailto:OvmsDev@lists.openvehicles.com" class=""
moz-do-not-send="true">OvmsDev@lists.openvehicles.com</a><br
class="">
<a class="moz-txt-link-freetext" href="http://lists.openvehicles.com/mailman/listinfo/ovmsdev">http://lists.openvehicles.com/mailman/listinfo/ovmsdev</a><br
class="">
</div>
</blockquote>
</div>
<br class="">
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<pre class="moz-quote-pre" wrap="">_______________________________________________
OvmsDev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:OvmsDev@lists.openvehicles.com">OvmsDev@lists.openvehicles.com</a>
<a class="moz-txt-link-freetext" href="http://lists.openvehicles.com/mailman/listinfo/ovmsdev">http://lists.openvehicles.com/mailman/listinfo/ovmsdev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Michael Balzer * Helkenberger Weg 9 * D-58256 Ennepetal
Fon 02333 / 833 5735 * Handy 0176 / 206 989 26
</pre>
</body>
</html>