JanetGilbert

Thanks Carlos!

@calbzamcan we connect you with my colleague so that you can figure out what is going wrong? Email me at janet@wadjeteyegames.com Thanks

What characters do you support on Windows and not on MacOS? I did not change any filenames at all, or add any files. What I was doing was checking in some slightly changed versions of existing files. I can't show you the problem in GoToMeeting because it doesn't happen on my computer.

I am working from a Mac and my colleague is using a PC. I'm not sure what he was trying to do, because we are both new to this system, and the UI doesn't make it at all clear. He was trying to do a checkin, but for some reason a merge was triggered? We both work remotely, so I can't see what he does. I had checked in before him so perhaps my work did not automatically merge with his. Here is a link to his logs. https://www.dropbox.com/s/lzhqh03or91an1r/plastic.debug.log.txt?dl=0

When my colleague tries to push to our repository, he gets the error message "Illegal characters in path." He closed the window, and told it to check in to a new branch instead, but it wouldn't comply because "a merge is in progress". It told him that the only way to proceed was to either proceed with the merge (which it wouldn't, because illegal characters), or to undo the changes, which reverted it to a version before he had made any changes. How can we fix this? Our repository is unusable at the moment. I have attached a screenshot of the problem. As far as I know there are no non-ascii characters in the filenames because the game is purely in English. What characters are disallowed? Are spaces OK?