Re:Git is too hard
by wpietri on Thursday November 19, 2020 @05:43PM
(#25155242)
I have lost work. A colleague force-pushed something because he thought he understood Git well enough to get away with it.
[ Parent
| on HN ]
If you can find your prior branch head with git reflog, you can assign a new branch name to it and push it.
Then go back to your force-pushing colleague and tell him to resolve the merge conflict he created by thinking he was too clever.
The command "git log --all --oneline --graph --reflog" will give you an exhaustive listing of the commit graph in your local repo.
Examine the output of that command in detail before declaring your work to be lost.