Skip to content

Instantly share code, notes, and snippets.

View c3farrell's full-sized avatar

Chris Farrell c3farrell

View GitHub Profile
@tigerbears
tigerbears / gist:9480433
Created March 11, 2014 06:11
Avoid arm64 builds with Xcode 5.1 and Cocoapods
Like many of us, my company's iOS project:
- Has dependencies preventing arm64 support
- Uses Cocoapods
- Relies upon CI
- Would love to be built with the new Xcode (and LLVM) 5.1 hotness
Since Xcode 5.1's standard supported architectures now includes arm64, we needed to remove that architecture in a way that would persist across clean installs of our pods during our Jenkins CI server's workflow. This is my first time working with Cocoapods, so I had to do some digging to tie up the loose ends.
The first step is simple enough:
@jbenet
jbenet / simple-git-branching-model.md
Last active June 17, 2024 14:53
a simple git branching model

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.