Some bad Git situations and how I got myself out of them

Re:Some bad Git situations and how I got myself out of them by OskarS on Friday September 09, 2016 @09:58AM (#12462234)

1- That's certainly true, git is really hard to learn. But if you're a developer it's worth getting comfortable with it, which means not going for the "nuclear option" every time something weird happens. Someone on StackOverflow has had your problem, and has the perfect fix, look that up instead.

2- Yes, absolutely, it's good to remember that it's a fairly painless and easy process to spin up fresh clones. Though, if all you want is a fresh copy, in 99% of cases a "git clean -xfd" will do that for you (read the man page to find out what the options mean! man pages are your friend!). Though that one is generally a "pull ripcord in case of emergency" type of command, "git stash" generally suffices and avoids risk of losing data.

[ Parent | on HN ]

Re:Some bad Git situations and how I got myself out of them by dahart on Friday September 09, 2016 @10:20AM (#12462429)

I totally agree, git is worth learning.

I don't recommend git stash, it frequently causes bad situations. Just branch instead, branching is safer and just as easy as stashing. Stash is not as safe as other git commands. From the man page: "If you mistakenly drop or clear stashes, they cannot be recovered through the normal safety mechanisms."

[ Parent | on HN ]