MAMEWorld Christmas Tree Ice Skating Arcade Party Town >> EmuChat
Previous thread Previous  View all threads Index   Next thread Next   Flat Mode Flat  

John IV
IV/Play, MAME, MAMEUI
Reged: 09/22/03
Posts: 1596
Loc: Snohomish, WA, 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/







Entire thread
Subject Posted by Posted on
* [Q] Best practices for using GIT to *just* compile new builds. John IV 10/23/14 08:36 PM
. * Re: [Q] Best practices for using GIT to *just* compile new builds. Master O  10/23/14 11:20 PM
. * Re: [Q] Best practices for using GIT to *just* compile new builds. Olivier Galibert  10/23/14 08:49 PM
. * Re: [Q] Best practices for using GIT to *just* compile new builds. John IV  10/24/14 09:28 PM
. * Re: [Q] Best practices for using GIT to *just* compile new builds. R. Belmont  10/24/14 10:02 PM
. * Re: [Q] Best practices for using GIT to *just* compile new builds. TafoidAdministrator  10/24/14 09:31 PM

Extra information Permissions
Moderator:  redk9258, URherenow, Tafoid 
1 registered and 30 anonymous users are browsing this forum.
You cannot start new topics
You cannot reply to topics
HTML is enabled
UBBCode is enabled
Thread views: 1813