background preloader

Tech

Facebook Twitter

Twitter story. HTML 5 Asteroids. A successful Git branching model.

Java

My Common Git Workflow. May 13th, 2010 A recent post that was highly ranked on Hacker News complained about common git workflows causing him serious pain. While I won’t get into the merit of his user experience complaints, I do want to talk about his specific use-case and how I personally work with it in git. Best I can tell, Mike Taylor (the guy in the post) either tried to figure out a standard git workflow on his own, or he followed poor instructions that tried to bootstrap someone from an svn background while intentionally leaving out important information.

In any event, I’ll step through my personal workflow for his scenario, contrasting with subversion as I go. Cloning the Repository The very first step when working with a repository is to clone it. In git, this is accomplished via git clone (the http protocol is also possible). Making the Change In both git and subversion, you make the change using a normal text editor. After Making the Change Updating from the remote Resolving Conflicts. Apple, Adobe, and Openness: Let's Get Real. There's a huge debate online about who's "right" between Apple and Adobe in the dispute over allowing Flash on the iPhone. Both companies portray their actions as protection of users and developers, but in reality what they're both protecting is their profits. There's nothing wrong with doing that -- it's what companies are supposed to do.

But the only truly innocent victims in this dispute are the people trapped between Adobe and Apple. Why Apple really doesn't want Flash on iPhone Steve Jobs outlined his case against Flash in a recent open letter. Flash is proprietary.H.264 video is better than Flash video.There are lots of games on iPhone, so you won't miss the Flash ones.Flash is insecure.Flash makes Macs crash.Flash is slow and reduces battery life.Flash doesn't work well with touchscreen technology.As an independent development layer, Flash reduces Apple's ability to innovate. I'm not going to evaluate each of those claims; others have done a good job of that already. What are the lesser known but cool data structures ? - Stack Ove.