We all have been there... For the beginner it's easy to mess things up. What are your horror stories with Git?
this post was submitted on 29 Jun 2023
440 points (98.9% liked)
Git
2632 readers
1 users here now
Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
Resources
Rules
- Follow programming.dev rules
- Be excellent to each other, no hostility towards users for any reason
- No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.
Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.
founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the 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
git merge --abortor, after it's been done, the nuclear option is to
git reflog, find the state before your did the merge, andgit reset HEAD@{4}or whatever HEAD@{#} it is.