Local branch commit is lost during merge activity

0
Hey fellow developers,   I've managed to loose my work during commits and unable to revert it. Here's what happened: Downloaded a branch from a team server called Dev branch. Usually, on top of the application our team sees AppName (Dev, Git) - 10.6.1; but this time around I had AppName (Dev, privateserver Git) - 10.6.1 - Image seen below: When working on the branch I was weirdly asked for Author and Email credentials. I've have never seen that before, but decided to input my name and email - Image seen below: Then I committed my changes locally and decided to pull updates in from team server (rebase). All I see from there is I have the latest Dev branch (from team server), but all of my changes I have worked on are missing. My local commits are not in Dev branch's history either. Any suggestions on ways I can recover my local commit? Are my local changes committing to a completely different server?
asked
1 answers
1

If you encounter issues like this with a credentials prompt, I would recommend first restarting Studio Pro. I'm aware of some sign-in issues (especially after having Studio Pro open for a long time, possibly in combination with 'sleep' of your computer), that might play a role here.

To retrieve the commits you can try using external tooling like TortoiseGit.

answered