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.
For quite a long time , i have been working with tortoise SVN, when i took the latest from the repository (after many days), to my goodness i found out many files were in the conflicted state. It takes a lot of time to manually resolve each of them manually.
would someone suggest the best practices /3rd party tools / tips for resolving the same.?
thanks ,
vijay
I’m not sure I would trust any 3rd party ‘silver-bullet’ app for resolving merge conflicts. In my experience, the best method is to update as often as is feasible so when you do get conflicts, there may be fewer. As far as resolving conflicts, there’s no substitute for you looking at the conflicts and deciding what to do about each one individually.
I do use SourceGear DiffMerge for my merge conflict editor. It makes it a little easier.