"I've always liked git's merging algorithm, so I thought I'd show an example where it works exactly like I'd expect. Since svn merges never worked like I expected, I never bothered, but git always seems to Do What I Mean. Let's start by creating a project: ..."
Full story »
