[Ovmsdev] Ready for 3.2.011?

[Michael Balzer]

Last but one, after the merge:

    #!/bin/sh
    set -x
    git fetch upstream
    git checkout master
    git merge upstream/master
    git submodule update --recursive
    git push

Regards,
Michael


Am 04.04.20 um 20:55 schrieb Craig Leres:
> 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

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