Hi -
I was trying to merge modifications from a branch into a working copy. I had a
few tree conflicts, and when I tried to resolve them, whether requesting to
keep the directory from the repository or marking the conflict as resolved, I
got the following exception:
Subversion encountered a se
These were the steps I took before I got this error:
1. I branched a project and committed my changes to the branch.
2. I checked out a fresh working copy of the trunk.
3. I merged the changes from the branch into the fresh working copy of
the trunk.
4. I committed the
