Archive of posts with the tag

  • 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,...

    Continue Reading

  • Getting GitHub: Why journalists should know and use the social coding site

    The famous GitHub logo. If you've been hanging around newsrooms or journalism classrooms lately, you've probably heard the word GitHub. It might sound a little scary and mysterious, but even the most traditional pen-and-notebook journalists should know about this super helpful tool (to say nothing of aspiring newsroom programmers). So, what, exactly, is GitHub? Why do you need to get it? GitHub is a social coding site. Designed for the purpose of democratic and collaborative...

    Continue Reading

subscribe via RSS