heuristics for dealing with SVN tree conflicts