Fairly often, when I do a merge from my branch to the trunk, a handful of files are show with a _M indication (that is underscore in column 1 and an M in column 2)
What does this mean? How do I clear it out? Even blowing away the sandbox and checking out the whole tree does not seem to clear it. Thanks Pat
