How to merge two seperate - yet similar - codebases into one SVN rep?
问题 I have /var/www/cool_codebase on www.example.com AND I have /var/www/cool_codebase on www.example.net The codebases are for the same web app running on different servers. There is some specialisation between the codebases (client-specific bits and bobs etc) - but not too much. One codebase has files that the other doesn't and vice-versa. Some bits of programming are different too. I have downloaded each codebase to my localhost and my question is: How can I merge these two folders into one