On Thu, 18 Aug 2011 18:13:09 +0000, Stefan Sperling wrote:
...
> But I don't think subversion should enforce one particular merge outcome.
> My opinion is that the user should be given a choice, and be supported
> by an interactive conflict resolution prompt that shows all possible
> resolution strategies:
> - put all files in the same directory ("Markus Schaber's strategy")
> - rename the local directory
> - rename the incoming directory
> - delete the local directory, replace with incoming directory
> - discard the incoming directory, keep the local directory
> - discard both directories
Actually I think these are better handled by throwing away the merge
results and doing the renames/removes on the respective branches, then
redo the merge. I tend to feel uneasy in these interactive conflict
resolutions.
Andreas
--
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800
