[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Peter Kahn <citizenkahn_at_gmail.com>
Date: 2006-04-06 16:45:21 CEST

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
Received on Thu Apr 6 16:46:50 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.