Skip to main content
Tim's (still) not blogging

merged

And now I've merged all my recent changes from the master branch into an in-progress branch I started before all my just-merged changes. That was too easy. The stuff I've done today in git would have been a gigantic confusing undertaking with CVS, and probably not much better with Subversion (though my experience was mostly pre-1.5). I think git branches and ZFS snapshots are my two big game-changers so far this year. I've only done a few of each, but wow.