Looking for some BK assistance

[Justin T. Gibbs]

I'm trying to merge my 2.4.X BK tree with Marcelo's tree.  In the end,
I want to have a tree that I can "bk send" to Marcelo that backs out
the recent backout of the aic7xxx driver and puts the aic79xx driver
back into its original location.  I understand how to override incoming
content changes during the merge process, but the documentation on
undoing renames is a bit vague.  During the merge process, my local
file name is already a deleted name that is slightly different than
the name in the parent repository.  If I try to resolve the rename by
putting the file back into its original location, BK complains that that
name already exists.  The documentation also warns that renames should
only be performed in the master repository.  Can someone with BK clue
point me in the right direction on this one?

Thanks,
Justin