SVN: Merging an old branch to a new branch
Within an SVN repo, I have an old branch (lets call it branch1) which is now about 2 months out of sync from trunk, and I now need to create a new branch (branch2) to extend the functionality of branch1. 

It's very likely there are going to be conflicts and merged files, and due to the amount of time/work passed, I can imagine that an automatic merge is not going to be flawless, or maybe I should just have more faith.

Either way, I was wondering if anybody could provide any useful pointers for how I might tackle this scenario, and what sort of things I should watch out for, or will this simply be a case of simply doing the entire merge manually?

Thanks for any advice!

SVN: Merging an old branch to a new branch
===

Within an SVN repo, I have an old branch (lets call it branch1) which is now about 2 months out of sync from trunk, and I now need to create a new branch (branch2) to extend the functionality of branch1. 

It's very likely there are going to be conflicts and merged files, and due to the amount of time/work passed, I can imagine that an automatic merge is not going to be flawless, or maybe I should just have more faith.

Either way, I was wondering if anybody could provide any useful pointers for how I might tackle this scenario, and what sort of things I should watch out for, or will this simply be a case of simply doing the entire merge manually?

Thanks for any advice!
