CODEWITHSUNDEEP
tfsmerge
Mini
Mini

Reputation: 157

TFS baseless merge

I am merging two branches which do not have a parent child relationship. I have started with a single file to test if the merge is working properly before the actual merge. I am using tfs baseless merge in order to do this.The following is the command:

Tf merge /baseless C:\Inetpub\wwwroot\Test\CreateDescription.aspx.cs C:\Inetpub\wwwroot\Test1\CreateDescription.aspx.cs /recursive

Changes have been done in both the files. However in the resolve conflict dialog box I only see two options 1) Keep the changes in the target branch 2) copy code from source branch

Merge changes in merge tool is greyed out. What should I do in order to enable this option. I want to manually merge changes in the both the branches.

Upvotes: 3

Views: 4752

Answers (1)

James Reed
James Reed

Reputation: 14052

A simple way to do this would be to check out the file you want to be the target (i.e C:\Inetpub\wwwroot\Test1\CreateDescription.aspx.cs) and then use an external merge tool to merge the changes. I'm a big fan our SourceGear Diffmerge, mainly because it's free (as in beer). This will allow you to merge the files and resolve the conflics.

Once you've done this, you could run the baseless merge to establish the merge relationship between the branches and tell the merge tool in TFS to keep the changes in the target. You can also tell TFS to use DiffMerge as it's merge tool which might get rid of the problem all together.

Upvotes: 2

Related Questions