Hi I have just finished working on a branch and have performed a reintegrate merge back into the trunk. I only worked on 4 files in the branch and I carefully merged from trunk to branch several times (including immediately prior to the reintegration).
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. I feel unable to recommend branching to my colleagues, it just seems too complicated. I don't think they would have the time or patience to understand the nuances of merging. Do other people feel the same way? Is svn branching too difficult? (I am using svn server 1.5.5 and the 1.6.11 client. I wonder if things will be better when we upgrade the server?) This is not meant as a complaint, I am simply trying to judge whether svn branching is workable. With best regards David
