? 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
When I perform the merge to make sure all changes for the range make it from
Is there are easy way to say "merge and let A win" to avoid the conflicts?
-- Peter Kahn email@example.com firstname.lastname@example.org, pkahnpie1@AIM, skype: citizenkahn http://kahnstipation.blogspot.com Awareness - Intention - ActionReceived on Thu Apr 6 16:46:50 2006
This is an archived mail posted to the Subversion Users mailing list.