Error after rebase because of missing MAV_GENERATOR_STATUS_... definition

[amilcarlucas]

first do this on you local machine

git checkout master
git pull upstream master
git push origin

That will sync all the master branches.

Now, because you do not want to merge MisRelDec it to master, you want to create a local branch. As a simple rule don’t mess with master, master should always track the upstream master, that makes things easier. So:

git remote add amilcar https://github.com/amilcarlucas/ardupilot.git
git fetch amilcar MisRelDec
git checkout MisRelDec
git rebase master
git push origin

If that is working fine and you want to update your PR to ardupilot, then you first need to locally delete your MisRelSep branch using gitk --all
And after that rename the MisRelDec branch to MisRelSep
and finally to update the pull request git push -f origin

And after that gitk --all on your local machine should be very clear. with everything in the right place.

[Quaxwilly (Willy Zehnder)]

I tried to ignore the warning “This branch cannot be rebased due to conflicts” (see screencopy above), but unfortunatelly that isn’t possible.

Btw what do you mean with “git push Willy”? I guess my remote fork “origin https://github.com/WillyZehnder/ardupilot.git” so I use “git push origin”?

[amilcarlucas]

Updated again, was missing a step. Keep me posted, I`m curious if it all works

[Quaxwilly (Willy Zehnder)]

In the moment I’ve escalation management - I’ll try tomorrow

[Quaxwilly (Willy Zehnder)]

So today I tried the repair and for me all is looking fine.
Git Bash log - repair by Amilcar.pdf (107.4 KB)

But at build (I only tested SITL/plane) I still run into an error:

And as plausibility check I started the same build on master - with the same result:

The define of OSD_PARAM_NONE you can find on mavlink-master in ardupilotmega.xml - but sorrowly not in my repo.
Maybe you have forgotten the “git submodule update --recursive” before “git push origin”?
Edit: I tried that in a MisRelDec_PlayCopy of MisRelDec, but with no success.

In the meantime I noticed that the cleaned commits you made are probably not on my local yet?
(I didn’t completely understand that, but because we did a fetch/push instead a merge that could be ok?):

Many thanks again for your support and energy you give in here, Amilcar - I hope you will get it.

Edit 02.01.2021:

After a second rebase of origin/master and “git submodule update --init --recursive” the submodules seem to be updated (Submodule path ‘modules/mavlink’: checked out ‘d8cad47bb3e4ecf21ae631e492e9643cd063cb8c’) and the build of master is running without error.

Then I tried to checkout MisRelDec_PlayCopy and rebase also, but I don’t understand and how to solve the CONFLICT (submodule):

And I have an additional question, for that I could not find an answer in git tutorials:
What will that “M…”-line tell me? I guess “be careful, the submodules are not fitting”

fyi here is the error I’m getting when I try to build MisRelDec_PlayCopy:

[Quaxwilly (Willy Zehnder)]

@amilcarlucas solved that problem here: How to solve a CONFLICT (submodule) during rebase?