Merge conflict hell

5 Likes

7 Likes

My worst nightmare with git is the git checkout file command since it’s absolutely unrecoverable : sometimes I just need to discard changes, but then I’m so afraid to miss launch again while doing a arrow up –> ENTER (assuming the last command was git status, and BOOM, it’s a checkout…)

Now, to secure, I use to do :

cd whateverFolder
git checkout ../file
cd ..

Result is the same, except there is no way to miss launch again