Mac developer tools have a tool include called FileMerge + a command line based tool called opendiff to invoke it, to use this tool in Git, run this command:
git config --global merge.tool opendiff
then when you want to do a merge you can just use the command:
git mergetool
Easy and simple, the things you learn! 
War. War never changes. The end of the internet occurred pretty much as we had predicted. Too many legislations, not enough freedom or resources to go around.
The details are trivial and pointless. The reasons, as always, purely human ones. The internet was nearly wiped clean of life.
A great cleansing, a censoring spark struck by human hands, quickly raged out of control.
Spears of deletions fire rained from the DNS servers, entire domains were swallowed in flames and fell beneath the thriving redirects.
Freedom of speech was almost extinguished, their voice becoming part of the background noise that blanketed the internet.
A quite darkness fell across the tubes, lasting many years.
(Overheard on the intertubes)
Since I couldn’t find this anywhere else I will write it here on my blog, to add a static (read-only) text to the Settings Bundle add this to the plist (easiest using the source code editor).
<dict>
<key>Key</key>
<string>version_preference</string>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>DefaultValue</key>
<string>0.1</string>
<key>Title</key>
<string>Version</string>
</dict>
If you have a settings bundle in your application, this is a good way to check if you can access them, if not you can set the default values for the preferences.
id testPreference = [[NSUserDefaults standardUserDefaults] objectForKey:@"sync_preference"];
if (testPreference == nil)
{
[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"sync_preference"];
}
When using a translucent navigation bar, the content of the table gets “below” it, to fix the problem use this line of code.
tableview.contentInset = UIEdgeInsetsMake(navigationController.navigationBar.frame.size.height, 0,0,0);
It’s almost like magic, now the content of the table will not be “below” the translucent navigation bar.
“A scientist sees a sliding door on the USS Enterprise, gets excited, tries to recreate one in reality, and before you know it you can’t even enter your local Tesco without passing through at least two of the bastards. This phenomenon also explains the invention of Laser Quest, the iPad and Soylent Green flavour Pringles.”
From a funny article in the Guardian:
http://www.guardian.co.uk/commentisfree/2010/jun/20/charlie-brooker-why-talk-computer
Happy Midsummer (or Glad Midsommar for the Swedish speaking) I hope it’s not going to rain to much this weekend.
Have you tried HeiaHeia ?
A cool service to track your training or “Probably the most fun way to keep fit!” as they say in the tag line. The reason why I brought it up here is that I have spent some time on it and translated the service to Swedish, read more about it on HeiaHeia’s Blog. If you find any errors in my Swedlish don’t heistate to tell me!
Learned a little German when I was in Germany, “Die Sauerkraut ist in mein Lederhosen”.
Qt Developer Days 2009 was really cool, saw some very cool software and I can’t wait to get my hands on playing around with Qt 4.6!
P.S. The German is from the movie Top Secret.
