Git

Keep local WordPress plugin customisations while pulling upstream releases from the SVN repository using git-svn — changes merge cleanly without conflicts.

Switching from Subversion to Git reduced development time significantly — no more waiting on commits, merge anxiety, or overwrite fears. Development is fun again.