[Dxspider-support] Git Error Help Please

Jim Reisert AD1C jjreisert at alum.mit.edu
Tue Dec 3 02:19:07 GMT 2013


On Mon, Dec 2, 2013 at 3:43 PM, Keith Le Boutillier <KeithL at lebs.org.uk> wrote:

> error: Your local changes to the following files would be overwritten by
> merge:
>
>         Changes
>
>         data/cty.dat
>
>         data/prefix_data.pl
>
>         perl/Version.pm
>
> Please, commit your changes or stash them before you can merge.

Just remove the three files, and perform the update again. They will
be replaced, instead of merged.

-- 
Jim Reisert AD1C, <jjreisert at alum.mit.edu>, http://www.ad1c.us



More information about the Dxspider-support mailing list