5 ms·
I hate to say it but because I don't feel comfortable with git enough whenever I am about to do anything outside of my comfort zone I make a hard copy of my who
by giancarlostoro 8y ago
I hate to say it but because I don't feel comfortable with git enough whenever I am about to do anything outside of my comfort zone I make a hard copy of my whole directory just to be sure if I get myself into a FUBAR state I can delete the FUBAR'd directory and copy it again. This has saved me many a headache. Also gives me a fresh state from which to ask for help from. Anytime the word rebase is mentioned my coworkers shriek.
- the_duke 8y agoYou should really work through some Git tutorials. I haven't done that since using SVN 10 years ago. `git {branch,diff,stash}` should be all you need for this. Especially working with the stash will be a big productivity boost for you.
- giancarlostoro 8y agoMost of what I do is handled by my tooling for me. It's when I have to do more than just the basics that UI tools somewhat fall short. I prefer the UI that JetBrains IDE's give because I can see visually what I am about to commit. I've made a lot less mistakes than my colleagues who either don't pay attention to the UI or swear by the command line but still miss simple things quite often, the worse I do is a typo here or there which a command line approach would of never saved me from either. To be fair I don't even remember anymore when I've had to do anything extensive, it's been quite a while. I'm even able to handle merge conflicts right away from within my editor.
- kingosticks 8y agoHave you ever had a look at the combination of 'git reflog' and 'git reset --hard <ident>'? You can find the point before you did the uncomfortable operation and restore your state to exactly then. Saves having to make that backup copy (which, again, can be slow for a big repo).
- pjc50 8y agoNeither of those saves the working directory, though. So uncommitted work "feels" at risk while typing unfamiliar git commands. (I now consider myself pretty good with git as a result of being forced to learn gerrit, but I also still remember the early painful days)
- kingosticks 8y agoTrue, that's a good point.