Hi all, I have 2 questions:
1) I am looking for a specific explanation of the errors "Skipped" and
"Skipped missing target." I don't buy this weak explanation of "the
user screwed up" because that isn't always accurate. I want to know
exactly what conditions cause the tool to throw these 2 specific errors.
2) I am looking for a way while merging to force a conflict if a file
was deleted in 1 location and but merely changed in the other location.
I'm getting these 2 errors "Skipped" and "Skipped missing target." when
I perform a merge in which certain files were refactored. By that I
mean they were renamed (deleted then added) in one branch, but they had
edits in another branch due to bugfixes or new feature development.
The documentation says that "Skipped" errors mean "the user did
something wrong." This might be a valid explanation sometimes, but
refactoring is not "wrong", it is a normal part of software development
in a mature project. And in a large, active project, it may happen
that a file gets renamed in one branch but edited in another branch, due
to miscommunication or whatever reason. Again, not necessarily
"wrong", just exceptional.
That being the case, the description "the user did something wrong" is
really a lame cop-out to avoid saying "the tool encountered a situation
it could not handle." I want to know exactly what those situations
are, and exactly what the messages mean, so I can figure out what
external workarounds and tracking we need to put in place.
Thanks in advance,
Received on Fri Apr 20 21:28:39 2007