Alex Rivera | Logout

Svn merging trunk and branches

Asked 2010-03-09T15:40:35.407
11

I have a huge project.

I need to make a branch - this will be version 2 of the project, but I also need to keep the trunk and change it in parallel with the branch 1 as bug fix to the version 1.

I need to merge bug fixes from the trunk to the branch 1 while adding new features to the branch.

At the end I need to merge all changes back in the trunk and make new tag from it.

So I need bug fix for version 1, new branch for version 2 and of course merging bug fixes in the version 2.

I am using svn but the svn makes problems all the time. I cannot merge anything without conflicts.

Can someone give me an advice what to do?

Regards

svn merge branch trunk
Edit
Report

1 Answer

0

First and foremost I suggest you have a look at the SVN documentation as suggested by @SanderRijken and see what feature and release branches are.

But by the sound of your question I assume your main problem is a different one. Namely that no merge at all is "working" (i.e. all give conflicts where you would not expect them). So maybe you could elaborate what you are doing exactly (like post the command you use for merging)?

answered 2010-03-29T06:42:01.830

Your Answer