File Exclusion on a Merge Branch with Subversion

Question

I created a function branch for the trunk for my project, and the function branch requires some configuration changes to the project file for it to work. When I merge the function back into the trunk, I do not want the project file to be merged. Is there a way to selectively merge certain files into the trunk? Perhaps an exception to the project file itself.

Answer 1

Merging in svn is a two-step process; first you merge the changes from your branch into a working copy, then you transfer the merged files to the repository. This gives you the opportunity to resolve conflicts or make other changes before performing a merge.

After you merge into your working copy, you can selectively revert changes to individual files before merging into the repository.