I encounter this issue pretty consistently when trying to merge a branch back into the trunk in TorstoiseSVN 1.5. Update and commit to both branch and trunk have no issue, its not until I try to merge that I get the:I encounter this issue pretty consistently when