[Svnmerge] Multiple conflicting revisions of one file in a merge

[Raman Gupta]

John Ricklefs wrote:
> Hello,
> I'm not sure if there is something I am missing that I can tell our
> developers to do to try to simplify this, except to run each of the
> above three merges independently, resolving conflicts and committing
> each time.  Has anyone else seen this behavior, or have a better
> workaround to suggest?

Nope you aren't missing anything. I think that running the merges
independently is the best workaround for now.

Cheers,
Raman