I'm no Git expert. Not sure how to revert that whole PR.

Same here

I added some features and fixes after it as well, just to make things interesting.

looks tricky

Yeah.

I wonder if you could just check out the commit right prior to the PR merge, commit that to HEAD and then cherry pick your features

Yeah, that was my thought as well. Trying now.

@User uploaded a file:

Don't know what half of that means 😁

i usually do a revert to get a second offsetting commit. it keeps an audit trail of the changes

reset might be a problem once you publish

because everyone's head might have moved on

the reset documentation looks even more scary than revert

Wow, this was hard 🙂

get it done though?

No, I just broke things even worse locally.

hey, another idea

the radio buttons are keeping you from blowing away work in your local repos

what if you just remove all the gradle projects, and then put back the one project from before the PR

Trying. I think your modules.xml messed things up a little with this statement:

<module fileurl="file://$PROJECT_DIR$/.idea/tornadofx-idea-plugin.iml" filepath="$PROJECT_DIR$/.idea/tornadofx-idea-plugin.iml" />

It references a new iml file, in the .idea folder, instead of the existing one a the project root.

Trying to manually change that.

That helped, now the module is recognized again. I bet that's still working for you though, due to some other changes we haven't figured out yet. I will try your idea now, just reverting the actual gradle project.

If I whack

.gradle

,

.idea

and then open the project in IDEA, I do not get a

.iml

file at the root of the project

I wonder if using the 'idea' gradle plugin would help -- it creates a file based project instead of a directory based one.

Hm.. I seem to have lost all my local commits now.

ohoh

No big deal really, rewriting that part now.

man.... sorry about all this