A couple of points on the author's points:
I always forget that `rsync` exists. Even for the obvious applications of sync. Stupid me.
The reason that merging NIB files is difficult is that they have binary files, not that they're bundles. If you change a connection in one branch, and add a widget in another, it's impossible to merge those changes.