Take the conflict out of merging with Kaleidoscope

I generally dislike GUIs and love the command line, but one thing that has always terrified me is resolving Git merge conflicts. Especially in large, complex codebases. Try as I might, I can never remember which version of the file is placed between those crazy markers Git puts in. When…

Vim cheat sheet

Often I'll learn something cool about Vim: a new command, a new way to use a familiar command, or how to 'shell out' with fun results. Until these nuggets of wonder are written immutably to memory, I'll post them here so I can look them up wherever I am, and…