TortoiseSVN+WinDiff took a lot of pain out of SVN merging, but in general with the trunk-based approach you'd usually only create 'dead-end' branches off the tr

TortoiseSVN+WinDiff took a lot of pain out of SVN merging, but in general with the trunk-based approach you'd usually only create 'dead-end' branches off the trunk which would not be merged back (for instance one maintenance branch per feature release to enable further patch-releases without holding up work on the next feature release already happening on trunk), in this case, only bugfixes would be cherry-picked in either direction (e.g. the most important rule for SVN was: avoid complex merge scenarios in the first place).