Get latest issue

[mlippert]

We seem to have run into a small problem with Get Latest which I think is easily worked around (I haven't tested that yet so that I could report what I think has happened first).

We had a sub-folder 'q' with a bunch of other folders and files beneath it.

That folder was deleted. (I don't know if this is relevant but, I think 'q' was then recreated, and deleted again).

Then another folder elsewhere was shared as 'q' in the location where the old 'q' used to be, containing many if not all of the same hierarchy as the old 'q', and probably having most of the same files (I need to ask the person who actually did this for more specifics at the beginning of next week.)

Now having done a get latest on my computer at some point before all of this, I do another get latest.

The get says it finished, but I still have an hourglass cursor and the status says something like "Updating files..." This lasts for quite a while. I also get an error (qsheet is 'q'):

Code: Select all

[3/11/2005 11:56:17 AM] Could not automatically merge E:\Projects\Mathcad13\mcd\sources\bin\qsheet\Symbolics\sym16.xmcd due to conflicts

However, I definitely did not edit that file, and when I go look for it now, it doesn't exist. There are no files in that folder, even though there are 28 files in the _sgvault folder (not counting the state file), and there are 10 files in that folder in Vault.

I am going to try deleting the entire 'q' folder from my working folder and do another get latest.

Mike