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.
SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don’t serve me very well. At the moment I’m using a combination of manual ‘svn merge’ and the graphical diff Meld. Are there better alternatives (non-win32)?
Actually there are reports of people using git-svn or hg-svn bridges to download a tree, preform a merge, then upload the merge. Doesn’t solve the messiness part but the increased speed of the merge makes it less tedious.