Code merges in Visual Studio changeset cleanup

(1) Share

Report

Posted on by Celeste

275

We use daily pipelines running from a Dev branch to build code based on the day’s check ins.

We have a Main branch to which changesets are merged from the Dev branch, done in Visual Studio using Source Control Explorer (TFVC, not Git).

I’ve recently deployed an ISV from a vendor that was not properly checked. The packages received from the vendors was build on development environments (not pipelines). I don’t have control over the vendors processes due to politics on the project.

This means that I checked in multiple deletions and deployments of the ISV to the Dev branch, which means multiple changesets. These changesets will never get merged to higher branches.
Is there any way to cleanup unnecessary changesets which will never be merged, from the list of available changesets when merging from Dev to Main branches?

Categories:

Dynamics 365 general

I have the same question (0)

All responses (1)

Answers (0)

Suggested answer

Martin Dráb 235,924 Most Valuable Professional on at

Like (0)

Report

Code merges in Visual Studio changeset cleanup

You can use tf merge /discard on command line (you can easily find more details about it on internet, e.g. How To Remove A Merge Candidate From The Merge Tool in Visual Studio). I sometimes used it in the past. It's good to fix these things ASAP, before it becomes a mess. An alternative is actually merging everything (all the deletions etc.), although you're really interested just in the final state.

Was this reply helpful? Yes No