CODEWITHSUNDEEP
visual-studio-2015tfsmerge
Giuseppe Cecca
Giuseppe Cecca

Reputation: 1

Issue with merge TFS 2015 VS 2015

I'm new in TFS and I have a problem when I have to merge a file. Yesterday I have branched a project so that other people can work at the same time, today I've done some changes on one file of this project, also other people have done some changes on the same file on the branched project.

Now I want to put the changes done in the branched project into my code, but when I do a merge from the branched file into mine, TFS find some conflicts but allows me to "keep target branch version" or to "take source branch version".

In this scenario I have to choose between the changes that I've or the changes done in the branched project, is there a way to put both the changes in one file? Why the button "Merge Changes in Merge Tool" doesn't appear?

Thanks for the answer.

Upvotes: 0

Views: 218

Answers (1)

PatrickLu-MSFT
PatrickLu-MSFT

Reputation: 51083

If you got conflicts when you do the merge operation. You should first resolve these conflicts take either the target or source version based on your requirement. After you resolved the conflicts, you can then do the merge operation.

In your case, since you want to put both the changes in one file. As a workaround, you could do a manually merge by selecting Merge, then entering the changes directly.

Upvotes: 0

Related Questions