Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

What's the correct procedure to merge a branch to trunk in svn in command line? Currently I just commit at branch, then switch working copy to the trunk, and merge the brwhen merging branch to trunkanch to working copy, at last, commit the changes to trunk. While I am merging the branch to working copy at trunk, there are always conflicts I have to edit myself. This seem to be annoying. Is the procedure correct? Could I avoid the conflicts?

share|improve this question

2 Answers 2

Ya, conflicts are part of the process, there are some graphical tools out there that will help you resolve these conflicts. However if you need to do it command line, there is a good tutorial here: http://www.duchnik.com/tutorials/vc/svn-conflicts

Its really quite simple actually, once you understand the basics of what is going on.

share|improve this answer

Conflicts surface whenever the differencing logic can not make an educated assumption on the expected behavior during the merge. Instead of fouling up the merge it forces the decision to the user and allows them to make an educated decision to force the desired outcome.

A walk through for what you describe can be found here. Keep in mind however that conflicts are inevitable and can not be avoided.

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.