Svn merging trunk and branches
- by Darko Petreski
Hi All,
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