4
jshint
8y

Today a merge deleted a bunch of code I had pushed in different branch. How the fuck did that happen? No conflict nothing! How can git delete something like this?!

Comments
  • 0
    Uh, really depends on what you did on your master. But git didnt delete anything, most probably. Use Git reflog to go to commit before merge and get you stuff back :)
  • 0
    @bolovsky I only merge on master and work on different branches which are up to date with master. I've no idea how did this happen. Had to rewrite everything.
  • 0
    @jshint don't know exactly the problem, but git doesn't delete stuff. If you committed it at some point, it should be there, unless you did some --force action. If that was the case, it's gone. If not, git reflog (which is apparently really underrated) :)
Add Comment