+1 for the second option.
2007/1/26, Ludovic Dubost <ludovic(a)xwiki.com>om>:
Could we get from those who know best some efficient ways to merge code
from the branch to the trunk and vice-versa. Everytime I do some merges
I'm not sure about what I'm doing.
+1
Merges are always painful for me :)
JV.