> Hi All
>
> We are using 1.6 SVN.
> We like to svn merge from our branch A to trunk.
> We have been diligent in svn merge from trunk to A.
> These svn merges from trunk to branch A also include --record-only merges
> too, in addition to regular merges.
> Development on branch A has stopped.
> Now
1. You can use svn merge --dry-run if you are using command line or if you
are using a client like tortoise then a test merge option should be available.
This won't actually merge but show if there will be any failure in case an
actual merge was performed.
2. Do the re-intergrate merge
