cidico Posted February 1, 2012 Report Share Posted February 1, 2012 Hi! A looooong time a go, by mistake, I added the .suo file to my controlled files. It lead me to a lot of trouble when merging. Now, I finally cloacked the damn file and work gracefully with my code. I switched to my /main branch and I'm trying to perform a merge with a branch but it always says that "Cannot merge. The item file.suo needs to be merged and is cloacked in your workspace". It turns out that the file is not cloacked anymore. I removed the damn file from the cloack and ignore list but it still seems to show the same error message. It's a loooong merge, a lot of branches and changesets since the last changeset in /main branch. What can I do to perform this merge? Link to comment Share on other sites More sharing options...
manu Posted February 1, 2012 Report Share Posted February 1, 2012 Ok, first search for all your cloaked.conf files on your disk, it's possible that you can have one in your "C:\Users\your_user\AppData\Local\plastic" directory, also in your cm.exe location dir and of course in the root of your workspace. If you don't find any cloaked.conf file return to me, we'll think something. Link to comment Share on other sites More sharing options...
cidico Posted February 1, 2012 Author Report Share Posted February 1, 2012 It worked! Thank you very much! The problem was the cloacked.conf at the my user's folder. Was this configuration set because maybe I selected the "Apply to all workspaces" option? Link to comment Share on other sites More sharing options...
manu Posted February 1, 2012 Report Share Posted February 1, 2012 Yep! Al your config files inside your user directory are shared by all your workspaces! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.