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)
if you didn’t change anything in the submodule, you could just remove its directory (rm -rf modules/mavlink) and then git submodule update --init --recursive back
Ahhhhh yes, it could be possible that @amilcarlucas had a specific revision on his branch (if I remember right he’s working on mavlink) - my branch is a pull from him.
So is there a way to discard all that submodule-changes on my branch and return to the clean current state of upstream/master? (sorry, I’m not so experienced in git)
For some strange reason your branch has mavlink commits. The branch I gave you did not have mavlink commits. Please do not make mavlink commits and all will be fine!
Thank you for clarification @amilcarlucas.
I’m not aware to have changed anything in submodules.
So I will investigate and try to rollback to have clean submodules.
Maybe that’s a good lesson for me.
Fell free to overwrite your MisRelSep branch with the one from me, using the instructions that I provided you and not missing the step to discard any local mavlink changes!
You need to change to the branch that I posted. Test it. if it works fine (and it should), delete your old branch, rename my branch to MisRelSep and force push it to github. I already explained you how to do those steps.
I just forced pushed MisRelDec into your repo
All should work now, on top of master
You need to do:
delete your local branch: git branch -D MisRelDec
get the one I did : git fetch origin MisRelDec
check it out: git checkout MisRelDec
test it:
Thank you Amilcar - I’ll try it by my own in the evening.
Edit 18:40:
SITL build for all vehicles -> OK -> SITL-Tests tomorrow
Edit 06.01.21 11:30:
MatekF405-Wing-SMR build for all vehicles -> OK
MatekF405-Wing build -> rework necessary because of missing define “MISSION_RELATIVE”
It works -Yippee - one step more done
Again a big THANK YOU to all that supported me, esp. @amilcarlucas
It would help me (and maybe others) to understand the fixing if you could explain in some words how you have done that “rollback” after my mistake.
Was it just a “git rebase -i master” and splitting/deletion of my bad commits?
Or is there a special way to go back to the normal behaviour (where master fixes the modules-version I guess)?