Overwriting rather than merging

[Samuel Jack]

I have a file to in a branch to which I have made extensive changes - it is almost a rewrite. I'm now trying to merge the branch containing that file into my trunk.

Having used the Merge Branches tool, that file now appears in my pending change set as Needs Merge. When I do show merge, the Merge tool always attempts to do an automatic merge. How can I prevent that? I really want to completely overwrite the file in the trunk, rather than trying to merge it.

Hope you can answer this soon!

Thanks,
Sam

[jeremy_sg]

I would recommend doing the following,

1. Choose resolve merge status from the context menu for the file. The status should now be Merged.
2. Copy the contents from the branch into the file.
3. Show Differences to make sure that you got all the right changes.