Can´t clone repo submodule

[StrandedAlien]

git submodule foreach --recursive git pull origin master Entering 'Kha' From https://github.com/armory3d/Kha

• branch master -> FETCH_HEAD hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches. fatal: run_command returned non-zero status for Kha

How can i make it work?

[MoritzBrueckner]

Hi, this is probably due to the fact that when Armory's Kha repository is updated from Kode/Kha, it's completely re-forked and some patches are applied to it. This means that the history of the "old" submodule is different than the "new" submodule, so Git doesn't know how to handle the changes in the old submodule that might get overridden.

I guess this article might help you: https://salferrarello.com/git-warning-pulling-without-specifying-how-to-reconcile-divergent-branches-is-discouraged/. You probably want to do a rebase in this situation.

Alternatively, it can be easier to work with a GUI client for Git, which would probably ask you what you want to do in this situation.