On Sat, Aug 24, 2013 at 02:18:59PM -0500, Les Mikesell wrote: > On Sat, Aug 24, 2013 at 2:04 PM, Stefan Sperling <s...@elego.de> wrote: > > I hope that we will eventually extend tree conflict handling to the > > point where it makes these kinds of situations trivial to resolve, > > even for novice users. svn should interactively offer a set of > > reasonable courses of action, such as removing the unversioned nodes, > > or moving them to a special lost+found area, or something else that > > allows incoming versioned nodes to be created in their place. > > Yes, but it would be nice if one of the choices were to overwrite all > unversioned directories and files with identical contents (but not > files with different contents) - perhaps optionally listing any > unversioned non-conflicting files that happen to be there.
Sure. If that's an option people consider useful we can add it to a conflict menu, once it exists. I'm very open to suggestions because we really don't know what users need in many such cases.
