merging back branch from trunk

In our environment, we currently work with a trunk and 2 branches.
As development in the trunk is getting more stable, we synchronize the
2 branches with the latest changes from the trunk. We did that many
times.
Now, we want to merge all the changes from branch1 back to the trunk.

Can we do a 'regular' merge between branch1 and the trunk?
Or do we have to be worried about the 'synchronization merges' we did
previously and need to exclude them from the merge?

Thanks,

Aymeric.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 24 11:59:42 2004