News Ultimarc Emu Loader Programming MAME Artwork progetto-SNAPS MAMEUI HBMAME EmuChat Hardware The Loony Bin MAME Artwork X

Entrance | Main Index | Search | New user | Login | Who's Online | FAQ | Rules

MAMEWorld >> EmuChat Previous   Index   Next   Flat

R. Belmont Cuckoo for IGAvania Reged: 09/21/03 Posts: 9716 Loc: ECV-197 The Orville Send PM Re: [Q] Best practices for using GIT to *just* compile new builds. 10/24/14 10:02 PM Reply > 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? You know how OG said "unless we fuck up hard"? Yeah, that.

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. Tafoid  10/24/14 09:31 PM

Extra information Permissions Moderator:  Robbbert, Tafoid  0 registered and 344 anonymous users are browsing this forum. You cannot start new topics You cannot reply to topics HTML is enabled UBBCode is enabled Thread views: 2447

Browser Test | Delete Cookies atom-guru atom-guru atom-guru atom-guru UBB.threads™ 6.3.2