MAME Git revert question

I wanted to revert Mame libretro before the OSD problems, something like 0.170, and just add some fixes for some particular systems.

I tried “git rebase xxxxx” but I got a lot of conflicts. Is there any way to do it easily or does it need a lot of manual resolving?

I think you would have to check out the desired commit and then just re-add the few desirable source changes by hand.

Thanks that helped.

git checkout -b <branch_name> [<start point (commit)>] Was what I was looking for.

So many issues with the compilation I couldn’t do what I wanted though…

I’m guessing reverting the groovymame changes that broke the aspect ratio and OSD would make the fork deeper and thus harder to merge updates from upstream?

Yeah you’ll have to review every single commit I suppose, that’s probably not a solution.

I think it started with the MewUI merge, not GroovyMAME.