After some corrections of my repo with great support of @amilcarlucas I’m struggling with rebase.
I didn’t change anything on submodules and just want to have the latest submodules of upstream/master in my repo. A “git submodule update --init --recursive” didn’t work as expected and a
rebase produced an error: CONFLICT (submodule)
I know how to solve a file-conflict, but I dont’t know how I could solve that submodule-conflict:
I read different things, but there I couldn’t find an answer:
(I asked that question in another thread too, but there it’s hidden deep in the conversation)