Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I find the whole process of merging two projects (one committed to SVN the other not) very lengthy. Manual changes are too many and too hard to make the new merged project compile. Is there any alternative to this ? The project that is not Checked into SVN has a backup. I do not want to use softwares such as Python etc.
When I faced a situation like this (was splitting workspaces across PVCS and SVN at a client) I used Beyond Compare to merge the files and folders. There are other great tools out there like DeltaWalker, DiffMerge, etc, but Beyond Compare was my favorite. I wish they would port it to OS X.