CODEWITHSUNDEEP
visual-studioversion-controltfsmerge
Sean
Sean

Reputation: 15164

TFS Branch & Merge

Is this an acceptable scenario for a TFS merge; if so, how do I do the merge:

We have a website which we branched in TFS. The original website, Branch A, was deployed to the Live site. Branch B was modified to run on a newer database structure (CRM system version upgrade).

Development continued on Version A. Some changes were also made on Version B.

Now, I need to get all the changes made to Version A, into Version B, so that Version B still runs on the new CRM database, but includes all the changes made to Version A since the branch.

In TFS merge tool, which is the source & which is the target?

Bonus Question: I've been struggling with this and I'm considering a different approach - can somehow I compare the current Version B with the version at the point of branching, to see which changes were made? There weren't a lot, and I could potentially take a fresh branch of Version A and just copy over the changes. How would I compare two full versions?

Upvotes: 2

Views: 1466

Answers (1)

Gerrie Schenck
Gerrie Schenck

Reputation: 22368

Well you answered it yourself I guess:

all the changes made to Version A, into Version B

source = A, target = B

bonus answer: right mouse button on the version b branch folder: compare. Source path = version b, latest version; Target path = version b, select the first changeset (this will be when the branch was created).

Upvotes: 2

Related Questions