Recover lost changes during unfinished rebasing

Question

I lost a lot of my work because I had unfinished rebase. I find out it when I was trying commit my 2 day work. I couldn't commit works until rebase is not resolved, so I abort it, because skip or continue didn't work. But with abort all my changes are gone ... can you tell me if it possible to recover these data please? Thank you in advice.

Answer 1

If you are using Intellij Idea you can use Idea's Local History.

Right click on package of source code which you want to restore (e.g, main) and select Local History > Show History and you will see your code history (also uncommited changes). Now you can find change when you lost your code and revert it.

Answer 2

IntelliJ itself is extremely aggressive about indexing and versioning your local changes to files (for me, it goes back months). Even if git has no way of helping, you might be able to recover your changes from IntelliJ.

Try this:

1. In the Project Explorer, right-click on the root folder for your project and click Local History > Show History
2. From the list of changes on the left, find the revision that you want to restore. IntelliJ labels revisions with additional helpful information like tests passing, commits, etc.
3. Right-click on the revision and click Revert to restore the directory to that revision. Alternatively, use Create Patch to create a patch file.