svn merge w/ exceptions..
From: Nathan Nobbe <quickshiftin_at_gmail.com>
Date: Thu, 20 Mar 2008 12:04:35 -0400
im just now getting into merging one branch into another and could use a
so the thing is, in the target branch a directory which still has files in
svn: Can't replace 'sentinel_v1.3/code/db' with a node of a differing type;
i understand the message, but in the result of the merge, for this directory
is this something where ill have to end up running merges for particular
This is an archived mail posted to the Subversion Users mailing list.