Better ChangeSet support, especially for merging

[benr]

We love Vault but are really starting to struggle with the merging.

We work on small, incremental features that we like to push live at a pretty rapid rate. Each change usually involves a number of files, and few checkins, and can last up to 2 weeks before it's ready to be merged into the deployment branch.

The process or merging the feature is quite painful. We keep track of all checkins related to the feature by including the bug tracker ID, so we can easily group them together by searching the history by comments, but then we can't do anything with them.

Since the checkins for the feature often aren't contiguous so we'll have to do a number of merges to get the feature across, which we are currently doing, but it has proven to be quite an error prone process which can lead to unnecessary problems.

Is there a better way that we could be doing this, or are there plans to make this approach more workable?

[lbauer]

We don't have a better way of handling this at this time.

We've had feature requests for the merge to be able to handle merging the latest version in each folder, rather than have to go through changesets, and also requests to be able to get certain files from "Dev" and apply them to "Production" like a patch.

I'll add you "vote" to these feature requests.