We all have been there… For the beginner it’s easy to mess things up. What are your horror stories with Git?

Link to xkcd

  • @earthquake
    link
    English
    1
    edit-2
    1 year ago

    git merge --abort
    or, after it’s been done, the nuclear option is to git reflog, find the state before your did the merge, and git reset HEAD@{4} or whatever HEAD@{#} it is.