Attack of the kites πͺ π #kite #kitefestival #park #sundayvibes #austin #texas #atx #shotoniphone #sky #bluesky via Instagram https://instagr.am/p/Cb500vQlGab/
Attack of the kites
Author: patmcg
Old skool π
Old skool π #motorcycle #porch #oldschool #bungalow #house #austin #texas #atx #shotoniphone via Instagram https://instagr.am/p/CbnLZY0OMAN/
The case for creating a merge commit
I’m always interested when someone has a strong opinion on how to merge code. I like this article because the author acknowledges that it’s just a matter of tradeoffs and then makes a case for a merge commit.
π The case for creating a merge commit
His basic argument is that a merge commit is the best of both worlds since it “maintains the small changes while allowing for 30,000 feet view of the history” with the --first-parent git log option.
But…
At the end of the day, what matters is to find a workflow that suits your team well and lets you deliver.
He also links to a couple of great articles on using small iterations (Kent Beck’s SB chages and GeePaw Hill’s MMMSS) that I need to blog later!
ο£ΏΒ Technotes
Looking for some tips on tricky Apple development issues like refactoring your storyboard, customizing the appearance of UINavigationBar, or an overview of the iOS Wi-Fi API?
Get it straight from the source on the new Apple Technotes.
Technotes are focused, timely documents from Apple Developer Technical Support. They explore a wide range of development topics and provide guidance for developers creating apps and accessories for all of Appleβs platforms.
Via iOS Dev Weekly.
Automatically resolve Xcode project file conflicts
Xcode project files are complex and not meant to be human-readable, so they can be scary to merge. When there’s a conflict, it’s never fun.
The tool Kintsugi intends to automatically solve these conflicts for you “99.9% of the time.”
πAutomatically merging conflicts in Xcode project files | github
The name Kintsugi (ιηΆγ) is well-chosen, meaning “the art of repairing broken pottery by mending it with gold.” π€―
Another interesting note: this project relies on a framework called Xcodeproj that lets you create and modify Xcode project files automatically. That sounds likes a better alternative than a homespun shell script. π
via iOS Dev Weekly
Mental Break Town 