Confused about the branches

Hi,

I'm a bit confused about the current branch scenarios, we have 1.2 on  
a branch and 2.0 on trunk. Several changes have been made on each, and  
none merged to the other.

Can I suggest we merge all branch changes to trunk, rename trunk to  
1.2-SNAPSHOT, and the branch to continuum-1.1.x (1.1.1-SNAPSHOT) and  
use that for bugfixes only?

WDYT?

- Brett

--
Brett Porter
brett@...
http://blogs.exist.com/bporter/