Branch Merging Question

In response to my stupid "Bad Merge Behavior" posts (The bad behavior
was all my fault.), a couple of people have suggested that when
merging a branch back to the trunk, you must first merge from the
trunk to the branch, then do a reintegration merge from the branch
back to the trunk.

While this might be a better way to go, I was under the impression
that you could just create your branch, make changes, then merge from
the branch back to the trunk. Is this wrong? Must we do the
reintegration merge in every case?

- Rush

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-19 18:45:32 CET