[...]Probably the cleaner solution is to just forget the d3d9_object_axis_display2 branch (it seems like it is only in your fork), go back to main, if needed sync in github in order to have the latest changes from orbiter/main, then branch from there into a d3d9_object_axis_display3 branch, and just copy-past the changes, test, commit, then PR.
That is exactly what I've done! - At least I think I did.
On my local machine I have fetched all branches from "origin" (my github I assume);
then I switched my local working copy to "main" (with I assumed to be "the same" as the sync'd github)...
I even checked, that
no changes from "d3d9_noise_problem" were in the source code! Therefore I assumed that my local copy is perfectly sane.
I am always amazed how complicated one simple commit can get with git + github! A 15 minute coding session is followed by 2 days of frustration and uncertainty
I know that it's my fault, 'cause Linus can't be wrong, right?
For people inside the project, you can just branch from orbiter/main and you don't even need a fork.
I am not "inside the project". I use a fork and have to create pull requests from that fork, right?
And regarding "rebase": I will not even try to do something like that, as I have no real idea about what that means
And cherry-picking is much to much hassle here. The changes are very simple - that's why I made the 2nd attempt (d3d9_object_axis_display2), but that looked the same afterwards...
I think I will (again)
- delete the whole development directory,
- go to my github web page and sync everything (every cync button I can click on ... )
- then check-out "origin/main" into a fresh new directory
- and see whether I can commit into a 3rd newly named branch.