daisy_knotwise, Katie, and Julie and resumed the earlier clicking and swearing at the nearly 500 files that needed manual merging in ClearCase. And, at last, I finished!And then I discovered that someone had added a new project to the source tree. My view sees it as empty. Update Resource does not fix this. Restore Resource does not fix this.
Unfortunately, I know from what I just merged that there should be files in the new project. And without them, I can't compile this mess to see how the merge did.
So I've sent an e-mail to our ClearCase expert for help, but he won't be in until at least 9 AM Pacific Time.
*sigh*
