Skip Navigation

Git @programming.dev canpolat @programming.dev 1y ago

Your Git horror stories

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

You're viewing a single thread.

52 comments

If I'm gonna merge some shit that'll probably have a bunch of conflicts, I'll create a throwaway "test-merge" branch because I'll inevitably fuck up the merge and even though I've used git for years I have no idea how to revert a merge andatthispointimafraidtoask.jpg
- This guy gits it.
  
  Thanks, noob noob
- 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.

52 comments