more confusing fun with git. I just want to pull the local stuff and have it overwrite EVERYTHING
ok yeeha i think i resolved the irritating conflict issue where in fact there was no issue i just wanted to overwrite everything with remote..
ok lets try this again...forgot to clean up engine.js conflicts...tested now and should be caught up with remote
figured out a collision solution but have to tweak the bug x-range detection