Not Cuckoo for CocoaPods

Posted by on Dec 10, 2013 in iOS | 7 Comments

The projects we work on generally have have dependencies on one or more (often several) open source projects, including our own libraries. We’ve always managed those dependencies using git submodules. As submodules have some quirks, a few projects have cropped up trying to make dependency management easier. The one that’s gained the most traction is […]

Git stash to store frequently used edits

Posted by on Dec 20, 2011 in code | One Comment

We work on a couple of projects that require specific changes to test a particular configuration, for example to test against a local server. We generally put this kind of configuration into a plist file and create a target that builds using that plist. Sometimes, however, that’s not convenient–for example, there may be several different […]

Using DiffMerge as your Git visual merge and diff tool

Posted by on Aug 17, 2011 in code, Git, Mac OS X, Software Development | 38 Comments

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 […]