From: OvmsDev <ovmsdev-bounces@lists.openvehicles.com> on behalf of Craig Leres <leres@xse.com>
Sent: Saturday, April 4, 2020 11:55 AM
To: OVMS Developers; Michael Balzer
Subject: Re: [Ovmsdev] Ready for 3.2.011?
On 2020-04-04 10:52, Michael Balzer wrote:
> Adding "--recursive" is recommended, but I think you really need to merge upstream/master before doing the submodule update.
>
> "submodule update" will update the submodules to the state as required by the current repository state. So you first need to update your branch or checkout an
> updated one.
Am I not updating in the correct order?
#!/bin/sh
set -x
git fetch upstream
git checkout master
git submodule update --recursive
git merge upstream/master
git push
Should the submodule update go last?
Craig
_______________________________________________
OvmsDev mailing list
OvmsDev@lists.openvehicles.com
http://lists.openvehicles.com/mailman/listinfo/ovmsdev