visual studio - How to enforce merging for hotfixes in TFS? -

visual studio - How to enforce merging for hotfixes in TFS? -

we using tfs advanced branch plan:

is there way can enforce hotfixes must merged servicing branch? had incident whereby deploy v1.2.0 of application, did not contain changes made in v1.1.1.

or have manually enforced process?

we have automatically-scheduled script performs such merges. gist of is:

tf merge src dest tf resolve /auto:automerge tf checkin

it's elaborate post here, since has much logging , monitoring - alerts me whenever there's merge conflict, etc.

visual-studio tfs merge tfs2010 branching-and-merging