Recipes‎ > ‎Programming‎ > ‎


Failure to merge --reintegrate

svn: Cannot reintegrate from 'url://feature-branch' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.

The problem is that subfiles or folders possess mergeinfo, and they should not.  The solution is to delete that mergeinfo.  You want to remember to keep the mergeinfo on . in your branch!  However, unless there is a really good reason to keep the mergeinfos for subfiles, you should delete them before you attempt to merge.

svn propdel svn:mergeinfo [subfile]