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.
here where we work, we have a bunch of merging problems. We use SVN and I know that is not a problem with the tool, but with the policy. But, what are the best merging practices/policies to minimize this. Or is there a VCS that makes merging more easier than SVN?
There is no tool that will merge automatically in all cases. The result of an automatic merge is always a best guess. You have a chance to verify the merge result before comitting.
There are a bunch of patterns and pitfalls that come with SCM in general. A really good source of information is this site: http://www.cmcrossroads.com
The anti-pattern you might be referring to is categorized as MergeMania.