SVN BITES
merge
To bring together changes on two separate branches: