I checked out another branch with updates then made a few changes, switched back to the main git and now the changes disappeared! Can I get them back? the terminal was basically
Assuming you're still on master:
git merge 7c09e17
should be enough. git is usually good about telling you the commit IDs, if you watch the terminal.
git