5 Apr
2020
5 Apr
'20
2:55 a.m.
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