Merge Branchs, but ignore some files

[ajj3085]

Hi,

Is there a way to merge branches, but specify files to ignore?

Specifically, I don't want to merge any .sln files; these are not changed ever in maintenance except to point to the correct location in source control, and merging them will cause development to point to the wrong location in source control for development code.

[Beth]

There is nothing in the tool that will let you just omit the files you want to from a branch.

Your options are:

1) Within the wizard, do not select the .sln files.
2) After the wizard, undo the changes/checkout of the .sln files.

You could also just perform the merge on the subfolders or be more granular about it rather than selecting the highest level folders to merge in order to avoid the .sln files.

[ajj3085]

I think i'll just use option 1, seems a bit easier.

Thanks
Andy