Using DiffMerge as your Git visual merge and diff tool
Our favorite (and free) visual diff and merge tool for OS X (as well as Linux and Windows) is DiffMerge. It makes resolving nasty Git branch conflicts a snap (relatively speaking). Here’s how to install it and configure it with Git on OS X: Download the DiffMerge OS X installer. Be sure to download the […]
Clearing Quicksilver’s clipboard to free up RAM
I’ve been using Quicksilver for so long it’s second-nature, and I hate being on a computer without it. One thing I use regularly is the clipboard history. The downside to this is that occasionally I copy something big into your clipboard, like a chunk of formatted text in Word or a range of cells in […]