> [b2]$ svn merge --dry-run ^/branches/b1 > --- Merging r2 through r4 into '.': > C README > Summary of conflicts: > Tree conflicts: 1
and yet another strange thing about it. There is no way to automatically resolve a conflict like this. no matter what flag I use --accept mine-conflict, mine-full, nothing seems to make merge operation happy. I have to issue a separate svn resolve --accept working command afterwards. Vadym
