Quantcast
Channel: Team Foundation Server - General forum
Viewing all articles
Browse latest Browse all 6687

Merge Changeset

$
0
0

Hi, 

my current configutration is the following:

3 branches: Dev (for dev) --> Integration (that has dev validated)  -> "Version3.0"

My issue is the following.

When I fix a bug for my customer, I fix it in branch "Version3.0" to be able to install it on his current version fast.

Then I do rigth-click, "branching and merging" to merge my changeset from branch "Version3.0" to Integration, then the same from Integration to Dev.

When I look at changeset to merge from Dev to integration, I see devellopment not migrated yet (which is normal) but I also see changeset migrated FROM integration !!

How can I do to NOT see this changeSet.

What I guess is that if files are the same in branch A and B, if I merge from A -> B, then change set is not visible to merge from B -> A (because files are the same after merge)

If files are different, merge from A -> B the changeset, when I look in B, the changeset is considered as not merged from B -> A.

Thanks for your help.


Viewing all articles
Browse latest Browse all 6687

Latest Images

Trending Articles



Latest Images

<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>