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,
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:
This saved 2 very productive hours of work and made my day. Thank you.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
This happened to me today and this answer fixed it for me.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
This saved 2 days of work that I thought was lost.. Thanks!!!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
THANKS
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
This saved 2 days of work that I thought was lost.. Thanks!!!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
This saved me and my colleague from couple of hours of work and a million tears
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
by the way if there are other commit maid after your lost commit, you can create a branch from this one and that way "clone" the existing branch. Then follow the steps suggested by Richard, and have your branch safe and sound with new name (of the newly created branch).
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Thank you so much @Arthurial.. Your answer saved me a lot ..
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Thank you, your answer saved my day!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Thank you you saved my works
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.