[Vm-dev] What do I do when this happens?

Hi git mavens,

I'm screwed. Had a perfectly fine repository that declared itself at the tip of Cog, I committed and then suddenly

[Cog 59455f2] CogVM source as per VMMaker.oscog-eem.2302 80 files changed, 4207 insertions(+), 2489 deletions(-) nsspur64src/vm/cogit.h: needs merge nsspur64src/vm/cogitX64SysV.c: needs merge nsspur64src/vm/cogitX64WIN64.c: needs merge nsspur64src/vm/cointerp.c: needs merge nsspur64src/vm/cointerp.h: needs merge nsspur64src/vm/gcc3x-cointerp.c: needs merge nsspursrc/vm/cogit.h: needs merge nsspursrc/vm/cointerp.c: needs merge nsspursrc/vm/cointerp.h: needs merge nsspursrc/vm/gcc3x-cointerp.c: needs merge nsspurstack64src/vm/gcc3x-interp.c: needs merge nsspurstack64src/vm/interp.c: needs merge nsspurstacksrc/vm/gcc3x-interp.c: needs merge nsspurstacksrc/vm/interp.c: needs merge spur64src/vm/cogit.h: needs merge spur64src/vm/cogitX64SysV.c: needs merge spur64src/vm/cogitX64WIN64.c: needs merge spur64src/vm/cointerp.c: needs merge spur64src/vm/cointerp.h: needs merge spur64src/vm/gcc3x-cointerp.c: needs merge spurlowcode64src/vm/cogit.h: needs merge spurlowcode64src/vm/cogitX64SysV.c: needs merge spurlowcode64src/vm/cogitX64WIN64.c: needs merge spurlowcode64src/vm/cointerp.c: needs merge spurlowcode64src/vm/cointerp.h: needs merge spurlowcode64src/vm/gcc3x-cointerp.c: needs merge spurlowcodesrc/vm/cogit.h: needs merge spurlowcodesrc/vm/cointerp.c: needs merge spurlowcodesrc/vm/cointerp.h: needs merge spurlowcodesrc/vm/gcc3x-cointerp.c: needs merge spurlowcodestack64src/vm/gcc3x-interp.c: needs merge spurlowcodestack64src/vm/interp.c: needs merge spurlowcodestacksrc/vm/gcc3x-interp.c: needs merge spurlowcodestacksrc/vm/interp.c: needs merge spursista64src/vm/cogit.h: needs merge spursista64src/vm/cogitX64SysV.c: needs merge spursista64src/vm/cogitX64WIN64.c: needs merge spursista64src/vm/cointerp.c: needs merge spursista64src/vm/cointerp.h: needs merge spursista64src/vm/gcc3x-cointerp.c: needs merge spursistasrc/vm/cogit.h: needs merge spursistasrc/vm/cointerp.c: needs merge spursistasrc/vm/cointerp.h: needs merge spursistasrc/vm/gcc3x-cointerp.c: needs merge spursrc/vm/cogit.h: needs merge spursrc/vm/cointerp.c: needs merge spursrc/vm/cointerp.h: needs merge spursrc/vm/gcc3x-cointerp.c: needs merge spurstack64src/vm/gcc3x-interp.c: needs merge spurstack64src/vm/interp.c: needs merge spurstacksrc/vm/gcc3x-interp.c: needs merge spurstacksrc/vm/interp.c: needs merge src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/IA32FFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c: needs merge src/vm/cogit.h: needs merge src/vm/cointerp.c: needs merge src/vm/cointerp.h: needs merge src/vm/cointerpmt.c: needs merge src/vm/cointerpmt.h: needs merge src/vm/gcc3x-cointerp.c: needs merge src/vm/gcc3x-cointerpmt.c: needs merge stacksrc/vm/gcc3x-interp.c: needs merge stacksrc/vm/interp.c: needs merge nsspur64src/vm/cogit.h: needs merge nsspur64src/vm/cogitX64SysV.c: needs merge nsspur64src/vm/cogitX64WIN64.c: needs merge nsspur64src/vm/cointerp.c: needs merge nsspur64src/vm/cointerp.h: needs merge nsspur64src/vm/gcc3x-cointerp.c: needs merge nsspursrc/vm/cogit.h: needs merge nsspursrc/vm/cointerp.c: needs merge nsspursrc/vm/cointerp.h: needs merge nsspursrc/vm/gcc3x-cointerp.c: needs merge nsspurstack64src/vm/gcc3x-interp.c: needs merge nsspurstack64src/vm/interp.c: needs merge nsspurstacksrc/vm/gcc3x-interp.c: needs merge nsspurstacksrc/vm/interp.c: needs merge spur64src/vm/cogit.h: needs merge spur64src/vm/cogitX64SysV.c: needs merge spur64src/vm/cogitX64WIN64.c: needs merge spur64src/vm/cointerp.c: needs merge spur64src/vm/cointerp.h: needs merge spur64src/vm/gcc3x-cointerp.c: needs merge spurlowcode64src/vm/cogit.h: needs merge spurlowcode64src/vm/cogitX64SysV.c: needs merge spurlowcode64src/vm/cogitX64WIN64.c: needs merge spurlowcode64src/vm/cointerp.c: needs merge spurlowcode64src/vm/cointerp.h: needs merge spurlowcode64src/vm/gcc3x-cointerp.c: needs merge spurlowcodesrc/vm/cogit.h: needs merge spurlowcodesrc/vm/cointerp.c: needs merge spurlowcodesrc/vm/cointerp.h: needs merge spurlowcodesrc/vm/gcc3x-cointerp.c: needs merge spurlowcodestack64src/vm/gcc3x-interp.c: needs merge spurlowcodestack64src/vm/interp.c: needs merge spurlowcodestacksrc/vm/gcc3x-interp.c: needs merge spurlowcodestacksrc/vm/interp.c: needs merge spursista64src/vm/cogit.h: needs merge spursista64src/vm/cogitX64SysV.c: needs merge spursista64src/vm/cogitX64WIN64.c: needs merge spursista64src/vm/cointerp.c: needs merge spursista64src/vm/cointerp.h: needs merge spursista64src/vm/gcc3x-cointerp.c: needs merge spursistasrc/vm/cogit.h: needs merge spursistasrc/vm/cointerp.c: needs merge spursistasrc/vm/cointerp.h: needs merge spursistasrc/vm/gcc3x-cointerp.c: needs merge spursrc/vm/cogit.h: needs merge spursrc/vm/cointerp.c: needs merge spursrc/vm/cointerp.h: needs merge spursrc/vm/gcc3x-cointerp.c: needs merge spurstack64src/vm/gcc3x-interp.c: needs merge spurstack64src/vm/interp.c: needs merge spurstacksrc/vm/gcc3x-interp.c: needs merge spurstacksrc/vm/interp.c: needs merge src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/IA32FFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c: needs merge src/vm/cogit.h: needs merge src/vm/cointerp.c: needs merge src/vm/cointerp.h: needs merge src/vm/cointerpmt.c: needs merge src/vm/cointerpmt.h: needs merge src/vm/gcc3x-cointerp.c: needs merge src/vm/gcc3x-cointerpmt.c: needs merge stacksrc/vm/gcc3x-interp.c: needs merge stacksrc/vm/interp.c: needs merge nsspur64src/vm/cogit.h: unmerged (ed6bf51d9ab7c6f5927f69e5661f22ad5cdf93d8) nsspur64src/vm/cogit.h: unmerged (6b84b3adf311e7e9655802800cf3c66cca5ae590) nsspur64src/vm/cogit.h: unmerged (8aeef63d69b098a39eea676e8707de91ff7d4097) nsspur64src/vm/cogitX64SysV.c: unmerged (197c00a9998d01982af526043c15480549118225) nsspur64src/vm/cogitX64SysV.c: unmerged (41adeb695b6a1d13c802967b1b2a08fcb48a7934) nsspur64src/vm/cogitX64SysV.c: unmerged (b61a13f47897197e7b58aa9c147ba87eb5cdc8f1) nsspur64src/vm/cogitX64WIN64.c: unmerged (ff6c102e326c6f85a5129ab03ee09b1f24b33304) nsspur64src/vm/cogitX64WIN64.c: unmerged (2cb03481942943a106feef898e2a99dd7e316a28) nsspur64src/vm/cogitX64WIN64.c: unmerged (ec4b0edb7cd243b040a5982f0a374c3fb3862f77) nsspur64src/vm/cointerp.c: unmerged (56db95c989c194930e8d7eeeebebb372ec63258d) ... fatal: git-write-tree: error building trees Cannot save the current index state /Users/eliot/oscogvm /Users/eliot/oscogvm nsspur64src/vm/cogit.h: needs merge nsspur64src/vm/cogitX64SysV.c: needs merge nsspur64src/vm/cogitX64WIN64.c: needs merge nsspur64src/vm/cointerp.c: needs merge nsspur64src/vm/cointerp.h: needs merge nsspur64src/vm/gcc3x-cointerp.c: needs merge nsspursrc/vm/cogit.h: needs merge nsspursrc/vm/cointerp.c: needs merge nsspursrc/vm/cointerp.h: needs merge nsspursrc/vm/gcc3x-cointerp.c: needs merge nsspurstack64src/vm/gcc3x-interp.c: needs merge nsspurstack64src/vm/interp.c: needs merge nsspurstacksrc/vm/gcc3x-interp.c: needs merge nsspurstacksrc/vm/interp.c: needs merge spur64src/vm/cogit.h: needs merge spur64src/vm/cogitX64SysV.c: needs merge spur64src/vm/cogitX64WIN64.c: needs merge spur64src/vm/cointerp.c: needs merge spur64src/vm/cointerp.h: needs merge spur64src/vm/gcc3x-cointerp.c: needs merge spurlowcode64src/vm/cogit.h: needs merge spurlowcode64src/vm/cogitX64SysV.c: needs merge spurlowcode64src/vm/cogitX64WIN64.c: needs merge spurlowcode64src/vm/cointerp.c: needs merge spurlowcode64src/vm/cointerp.h: needs merge spurlowcode64src/vm/gcc3x-cointerp.c: needs merge spurlowcodesrc/vm/cogit.h: needs merge spurlowcodesrc/vm/cointerp.c: needs merge spurlowcodesrc/vm/cointerp.h: needs merge spurlowcodesrc/vm/gcc3x-cointerp.c: needs merge spurlowcodestack64src/vm/gcc3x-interp.c: needs merge spurlowcodestack64src/vm/interp.c: needs merge spurlowcodestacksrc/vm/gcc3x-interp.c: needs merge spurlowcodestacksrc/vm/interp.c: needs merge spursista64src/vm/cogit.h: needs merge spursista64src/vm/cogitX64SysV.c: needs merge spursista64src/vm/cogitX64WIN64.c: needs merge spursista64src/vm/cointerp.c: needs merge spursista64src/vm/cointerp.h: needs merge spursista64src/vm/gcc3x-cointerp.c: needs merge spursistasrc/vm/cogit.h: needs merge spursistasrc/vm/cointerp.c: needs merge spursistasrc/vm/cointerp.h: needs merge spursistasrc/vm/gcc3x-cointerp.c: needs merge spursrc/vm/cogit.h: needs merge spursrc/vm/cointerp.c: needs merge spursrc/vm/cointerp.h: needs merge spursrc/vm/gcc3x-cointerp.c: needs merge spurstack64src/vm/gcc3x-interp.c: needs merge spurstack64src/vm/interp.c: needs merge spurstacksrc/vm/gcc3x-interp.c: needs merge spurstacksrc/vm/interp.c: needs merge src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/IA32FFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c: needs merge src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c: needs merge src/vm/cogit.h: needs merge src/vm/cointerp.c: needs merge src/vm/cointerp.h: needs merge src/vm/cointerpmt.c: needs merge src/vm/cointerpmt.h: needs merge src/vm/gcc3x-cointerp.c: needs merge src/vm/gcc3x-cointerpmt.c: needs merge stacksrc/vm/gcc3x-interp.c: needs merge stacksrc/vm/interp.c: needs merge unable to refresh index _,,,^..^,,,_ best, Eliot