nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Entire Commit Lost in SourceTree after Pull with rebase instead of merge

Arthurial

Hello,

I'm trying to recover a commit that was lost after an unsuccessful merge after pulling (with the rebase instead of merge option checked). Admittedly I'm not entirely sure about this process, as I was instructed to use it to avoid large merged commits, and that's why I'm in this mess.

After there was a conflict, I clicked 'Continue Rebase' by mistake instead of Abort, and consequently it has wiped out a lot of work. I'm using SourceTree's inbuilt version of GIT.

I would appreciate your assistance in recovering my work, since the commit is now entirely gone from this GUI's history.

Thank you,

Accepted answers

All comments

Balázs Szakmáry

Check if you have .orig, .bak or similar files left by your merge tool. If yes, you can use these. If not, there is not much you can do, unless the server or some other person's clone has the original commit.

Arthurial

Thanks Balazs. Luckily git hadn't deleted the commit. I managed to find and recover it using the terminal and perform a hard reset to restore my lost work.

For reference:

Open the Terminal in the Actions menu.
Type git reflog - this will display your recent history with ids for each git action.
Type git reset --hard your_lost_commit's_id - but this will wipe out all changes since that commit.

Adrià Marí

This saved 2 very productive hours of work and made my day. Thank you.

David Avila

This happened to me today and this answer fixed it for me.

dascoba

This saved 2 days of work that I thought was lost.. Thanks!!!

Michael Litner

Thank you. This saved half a day of my work!!!

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

windows