0

I'm still learning git and I'm using it for practice and as a tool to save my progress on my projects. I work from my office computer and from my home computer on the same application. I'm the only one working on it. Yesterday after I finished working from home I pushed my changes as always, but for some reason git complained (I must have done something wrong before). So I did (if I remember correctly) git push origin master --force.

Today at work I tried to update my local files and I got this message:

C:\Users\nova\Desktop\ez-class>git pull origin master
From https://github.com/sickdyd/ez-class
 * branch            master     -> FETCH_HEAD
 + ace98f3...145956d master     -> origin/master  (forced update)
Already up to date.

But... it's not up to date. So I googled how to sort this out and a bit in a hurry I assumed this was the proper way: Git pull after forced update

So this is what I did (sigh):

C:\Users\nova\Desktop\ez-class>git fetch

C:\Users\nova\Desktop\ez-class>git reset origin/master --hard
HEAD is now at 145956d hello

C:\Users\nova\Desktop\ez-class>git pull
Already up to date.

C:\Users\nova\Desktop\ez-class>git pull origin master
From https://github.com/sickdyd/ez-class
 * branch            master     -> FETCH_HEAD
Already up to date.

So I'm happy to let everybody know that apparently all my updates on the remote repository are gone as well as locally. I'm not sure what happened here... and is there any way I can fix this or I have to go home and push again the changes?

EDIT: finally I have to admit that git has been quite a pain in the ass just to keep files synced; do you know a better solution? Google drive won't allow to ignore subfolders (like node_modules).

devamat
  • 1,971
  • 5
  • 24
  • 45

2 Answers2

1

all my updates on the remote repository are gone

When you force push from home to office, you overrode the history of the master branch of office.

When you will have access your office, you can use git reflog to list the commit which was before your latest forced push. You can reset it to its old state.

Then, from home:

  • clone office repo again (in a new folder)
  • report your latest changes
  • add, commit, and push

More generally, for synchronizing files, Steve Gibson mentions several alternatives in:

Mainly:

VonC
  • 1,129,465
  • 480
  • 4,036
  • 4,755
1

What might have happened is you edited history with something like a rebase, or you happened to be in a different branch that didn't have your updates. Git gives you that warning when the history of your branches isn't compatible, and --force overwrites that history instead of simply adding new commits. I like to use git push, and default to the branch with the same name, instead of git push origin master. That helps prevent something like pushing to master from the wrong, out of date branch.

The good thing about git is that it doesn't delete commits, it only creates new ones. Your computer with the correct updates still has them. You can find them with git reflog. That shows you the history of your HEAD commit, which changes as you do your work. You can find the commit that looks right and run git checkout <commit-id> to see if that's the state you want. Then you can either create a new branch at that commit (git checkout -b recovery-test), or just switch back to master and reset master to that commit (git checkout master; git reset <commit-id>).

Blue
  • 508
  • 3
  • 10