(no subject)
From: Gross, Joseph S <joseph.s.gross_at_intel.com>
Date: Tue, 25 Oct 2011 17:44:50 -0700
Received on 2011-10-26 03:53:03 CEST
Date: Tue, 25 Oct 2011 17:44:50 -0700
Hi,
Encountered the following error. I had used a switch to move a large folder of data from a time-indexed area to an archive area. After the switch, it seemed as though the data did not move correctly, so I did a cleanup. In the time-indexed area I then saw some conflicted tree issues, and tried to look at the "edit conflict" dialogue. It gave options: "keep the directory from the repository" and "mark the conflict as resolved" since I assumed that the data was lost (I didn't get anything to move into the archive area) I tried keep directory from repository and got this error.
-Joe
[cid:image001.png_at_01CC933D.CBA0C160]