1. Delete the element accidently, fail to add

 

Error Message:

Error adding "Path/file.txt" to source control. Error: duplicate name "file.txt" found in the directory version Path@@/main/<stream_name>/<number>   Trigger "PRE_MKELEM" has refuse to let mkelem proceed.

Problem:

Developer create file A in folder B. folder B is under source control. and then add file A into source control and continue work on it. He delete (it should be rename according to CC) file A accidently. Now when you try to add the file A back to CC, PRE_MKELEM trigger prevent he to do it. 解决的方法是： （1） 是先找到还有该file的activity，然后点击：Version Tree (在被删文件的上层包处)看那个右键后merge to, 并在点击圈和线的连接点处就可以出现这个叫：Merge Configration 的界面. 选中yes的那个merge the element graphically. （2）然后再选中合适的版本，就可以把丢失的文件放进SourceControl中了。。 （3） 1. From the target view (where the file element or dir element was removed), click on the version tree of parent directory. 2. On the version tree find out which version have file element or dir element (where it was added) 3. right Click on the version from step2 and select merge to menu 4. Select the target view version (where eye was pointing) 5. Make sure you click the check box (In merge confirmation dialog box, select "Yes" and mark "merge the element graphically". CC ask "do you want to create the branch?, select "Yes") 6. Pls select the version that you want. If you can not make choice, pls click the selection with underscore. Then all selection will be enabled. While doing the merge, make sure, you get back those elements in the result windows 7. Save the merge and make sure the elements exist 8. Once confirmed, go ahead and check-in the parent dir