Merging new trunk files to existing branch?

- I created a branch, branchA, from trunk
- trunk tagged trunk with trunk2branchA, and branchA tagged
  with branchA2trunk
- Many new files added, which are of course not tagged with
  trunk2branchA
- Merging from trunk to branchA does not nerge new files
  of course
- Merging from branchA to trunk now deletes the new files
  on trunk

How can I resolve this so I can merge new untagged files
from trunk onto my branch?

-chris

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 30 19:01:44 2007