RE: How to do a partial merge from branch to trunk?
Hi I am working on a branch and I want to feed some (but not all) of my changes back into the trunk and then to continue work on the branch. Please will someone advise me of the correct way to handle this situation? Best regards David Generally the smallest unit you can merge is a single changeset. Check out the docs on merging and look for the Cherrypicking section.
RE: How to do a partial merge from branch to trunk?
Hi Bob Understood. Thanks for your reply. David -Original Message- From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: 12 March 2014 14:54 To: David Aldrich; 'users@subversion.apache.org' (users@subversion.apache.org) Subject: RE: How to do a partial merge from branch to trunk? Hi I am working on a branch and I want to feed some (but not all) of my changes back into the trunk and then to continue work on the branch. Please will someone advise me of the correct way to handle this situation? Best regards David Generally the smallest unit you can merge is a single changeset. Check out the docs on merging and look for the Cherrypicking section. Click https://www.mailcontrol.com/sr/bcXItoTZgCjGX2PQPOmvUoXR17WSa92v1rnK1DZKkWNxO0ZbWdUlxaBFThUi75+9gfoCO8sfTsFfcZxYauAECA== to report this email as spam.