? Merging Binaries, letting the source location or "their" code win in all conflicts ?

[Peter Kahn <ci...@gmail.com>]

I have a bit of a problem.  I have two branches each with scores of binary
files (FrameMaker Book files).
I'd like to merge from branch A to branch B.
Work has been done on A and not on B.
As work was done on A people manually copied the files over the B files and
checked them in

When I perform the merge to make sure all changes for the range make it from
A to B, I get scores of conflicts.
I know that A's changes should win and become what is on the B branch.

Is there are easy way to say "merge and let A win" to avoid the conflicts?


--
Peter Kahn
citizenkahn@gmail.com
citizenkahn@jabber80.com, pkahnpie1@AIM, skype: citizenkahn
http://kahnstipation.blogspot.com
Awareness - Intention - Action