Help to get my work back

[anhdd-kuro]

I don't know what Git Butler did, but my local repo became a mess.
My work is still showing in Git Butler, but I don't know how to get it.
I'm worried about messing it up more and somehow losing my work. It's too scary now.
As you can see, my work is showing as #d14b874 and 2d212b3.
I tried reverting and resetting, but nothing seems to work at all. My root folder became a mess. It's showing a bunch of Git Butler stuff.
Please help! I just want to move my work from #d14b874 to the main branch.

[Byron]

I am sorry for the hassle, this definitely shouldn't be possible!

It looks like the oplog trees and commit somehow became part of the workspace, so there is a strange mix of these in the worktree.

If 2d212b3 is truly the state you need, you could check it out into its own worktree. That way the data won't ever be lost. This could be done with git worktree add ../backup 2d212b3.
However, what might be better is to git checkout main followed by checking out the changes you are interested in, like git checkout 2d212b3 -- <paths and directories that were changed>.

If the work was committed, there is no chance you will loose it.

For real-time support I welcome you to the Discord server.