I want to be able to merge my changes to the main repository branch. I accidentally merged all my Unity files on the last merge and I think that caused an error for my next merge . I get the following error:
% hg --repository C:\kiln\development merge --verbose --tool=internal:fail 4595
~/Assembly-CSharp-Editor.pidb: untracked file differs
~/Assembly-UnityScript-Editor.pidb: untracked file differs
~/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll: untracked file differs
~/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb: untracked file differs
~/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll: untracked file differs
~/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb: untracked file differs
~/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll: untracked file differs
~/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb: untracked file differs
abort: untracked files in working directory differ from files in requested revision
I'm not sure what to do now. I was thinking about deleting those files from my local repository and then pulling from the main repo. However, I'm afraid those files might damage my game somehow.
What should I do?