Ideas |
How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts
Back in March, another student fellow Nicole Zhu and I worked on a team challenge for which we were the primary coders. One day, she emailed me: “Uhh. I messed up. Sorry. I think you have to delete your repo.” She had been attempting to resolve a merge conflict, ended up in vim somehow, nope’d out of there, and messaged me to let me know her solution was to delete everything and re-clone. More sadly,...