Mike Stump wrote: > When bulk merging trunk to local release branch, svn reports whole file > conflicts as 'A'. :-( >
If you can give me a way to reproduce it, i can fix it. I've never seen such behavior. AFAIK, all conflicts should be flagged as C, whole file or not.