John IV |
IV/Play, MAME, MAMEUI
|
|
|
Reged: 09/22/03
|
Posts: 1969
|
Loc: Washington, USA
|
|
Send PM
|
|
Re: [Q] Best practices for using GIT to *just* compile new builds.
10/24/14 09:28 PM
|
|
|
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: src/mame/drivers/peplus.c Please, commit your changes or stash them before you can merge. Aborting
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?
john iv
http://www.mameui.info/
|
|