> Thanks OG, however I ran into this scenario this morning:
> d:\MAME>git pull
> Updating ccfe7d3..9696c38
> error: Your local changes to the following files would be overwritten by merge:
> Please, commit your changes or stash them before you can merge.
> Now I haven't changed anything in the directory I cloned things into first, so how
> does one resolve this without a start from scratch clone?
You know how OG said "unless we fuck up hard"? Yeah, that.