Also, on the general handling for pull requests:

It's generally advised to create separate branches for all your pull requests, each concentrating on just a single feature / development topic.

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.

Pull requests track the branch they are created on, so any new commit added during the discussion will automatically update the pull request.

Once a pull reqest has been merged into the master, you can simply delete the branch.

Regards,
Michael


Am 17.08.20 um 07:38 schrieb Mark Webb-Johnson:
Yes, ^this.

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).

Preparing stuff for inclusion in the main repository should in general be done in local clone copies, then pull-requests made when ready.

Regards, Mark

On 17 Aug 2020, at 1:08 PM, Soko <ovms@soko.cc> wrote:

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.
If the PR is changed and improved until it is approved by you guys it should be OK to go into the master.

On 17 August 2020 07:00:37 CEST, Soko <ovms@soko.cc> wrote:
Hi Derek.

I would prefer the first option as discussing source is way easier on a PR in github as here in the mailing list.

Soko

On 17 August 2020 06:53:40 CEST, Derek Caudwell <d.caudwell@gmail.com> wrote:
Hi Mark,

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'? 

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 to invite others to collaborate/review? 

With the latter approach we may miss out on input from others not actively monitoring this forum I guess.

Regards Derek 
_______________________________________________
OvmsDev mailing list
OvmsDev@lists.openvehicles.com
http://lists.openvehicles.com/mailman/listinfo/ovmsdev


_______________________________________________
OvmsDev mailing list
OvmsDev@lists.openvehicles.com
http://lists.openvehicles.com/mailman/listinfo/ovmsdev


-- 
Michael Balzer * Helkenberger Weg 9 * D-58256 Ennepetal
Fon 02333 / 833 5735 * Handy 0176 / 206 989 26