> 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.