One of our users has been working in a branch, and has a few changes checked in in various changesets that we want to do not want to bring into the main branch when we merge his branch in. In short. I want to merge most of his changes into the main branch, but some of them I do not want.
I've tried all sorts of things, but Merge wants me to Merge everything. When I create a new changeset in the subject branch I can't seem to easily roll back any changes.
What is the correct way to do this in Plastic?