Menu
I have created a feature branch off of the trunk for my project and the feature branch requires some project file configuration changes for it to work. When I merge the feature back to the trunk I don't want the project file merged. Is there any way to selectively merge certain files to the trunk? Perhaps an exclusion of the project file itself.
857
You can use svn merge to “undo” the change in your working copy, and then commit the local modification to the repository. All you need to do is to specify a reverse difference. (You can do this by specifying --revision 392:391 , or by an equivalent --change -392 .)
Reverse merge In SVN SVN will keep common file contents in working copy from the specific revision of file and HEAD revision of working copy. if it is folder level. In SVN reverse merge, if not file found in the specific revision, it keeps the working copy as it is.
A merge in svn is a two-step process; first you merge the changes from your branch into a working copy, then you commit the merged files into the repository. This gives you a chance to resolve conflicts or make other changes before committing the merge.
After you do the merge into your working copy, you can selectively revert the changes to individual files before you commit the merge to the repository.
130
answered Sep 28 '22 05:09
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
