https://pinboard.in/u:starpause/public/ recent bookmarks from starpause 2012-02-15T21:50:24+00:00 http://kafkaris.com/blog/2011/06/15/quick-tip-merging-air-sdk-into-flex-sdk-on-osx/ starpauseair sdk latest merge merging https://pinboard.in/u:starpause/b:64da2aa5a233/ 2011-08-03T19:08:20+00:00 http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html starpausegit merging howto merge diff tool meld python https://pinboard.in/ https://pinboard.in/u:starpause/b:9f59145f86e0/