Re:How to undo almost anything with Git
by jordigh on Monday June 08, 2015 @04:11PM
(#9682032)
But if the remote has advanced since you pushed, you'll still need to reflog on the remote server, right?
[ Parent
| on HN ]
Someone must have pushed the version the remote was at, so the correct commit would be on someone's devbox.
It was a series of PRs merged on github, no one in the office had a current branch of develop.
It looks like you can use the GitHub API to get the events for the specific repo, which would include your force push, and the hash of the previous commit. Some instructions at https://objectpartners.com/2014/02/11/recovering-a-commit-fr...
edit: This should be in reply to jordigh's comment above
If it's just a matter of "merging" couldn't you just merge those branches again? Or do you resolve conflicts on github or some such (something that's never fit my workflow but I can imagine others using it)?
That's really the point. The guy who made the last change should have it locally as well. Even if he git pulls first.