On Mon, Dec 18, 2006 at 07:00:41PM +0100, Vincent Hennebert wrote: > To avoid in the future (painful) retrieval of changes made on a branch > and not in the trunk and vice-versa, I'd suggest to always work on the > trunk, and systematically merge the changes into the current branch. > That should ease things IMHO.
One should make changes to the branch as needed, and when the work on the branch is finished merge them into the trunk as needed. Simon -- Simon Pepping home page: http://www.leverkruid.eu --------------------------------------------------------------------- Apache XML Graphics Project URL: http://xmlgraphics.apache.org/ To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
