resolving import conflicts

I have a patch file, created with bk export, that I'd like to apply to 
another repository.  However the patch can't be applied to a couple 
files because of a conflict.

Is there a way to force the patch to be applied to the rest of the 
files, and to manually fix up the conflicts?  Is hand-editing the patch 
file the best approach here?

I used bk import -tpatch -C

It seems that the -R option doesn't matter.
 
Thanks,
Mike