Select "Do reintegrate instead of automatic merge (old style)" in the Merge Options window on the SVN GUI.