A long time ago, we started a new branch that has since become the main
development line. A few changes occurred on the trunk as well but that line
has effectively died out.
Now I would like to merge everything from the branch into the trunk,
ignoring any changes made in the trunk since the
On Tue, Apr 01, 2003 at 05:39:15PM -0800, Ed Swierk wrote:
Now I would like to merge everything from the branch into the trunk,
ignoring any changes made in the trunk since the branch was created and
removing any files in the trunk that are not present in the branch.
