> The reintegration correctly identified the four files that I had worked on > and that had changed, but also showed 101 files as 'Modified (properties > only)'. I know that there are good documents that describe merging and > explain what this sort of state means, but I struggle to understand what > is going on during merging sometimes. >
Please refer to my earlier post today, I have similar issues which really shouldn't be part of subversion's user experience. For some reasons, some properties get added when they should not be. What property is being added in your case? In mine is svn:mergeinfo. Carles
