[gpsd-dev] leapsecond.cache, git

[Greg Troxel]

I just updated and got:

Updating 4b83ce7..f2cd746
error: Your local changes to the following files would be overwritten by
merge:
        leapseconds.cache
Please, commit your changes or stash them before you can merge.
Aborting


I get this; it's because the file is checked in and modified during the
build.  This is broken.   Really it's broken to use the net at build
time, period.

But if this is going to happen, then there should be something that
either fetches the new file or copies the source file an objdir file if
that doesn't work, so that this problem doesn't happen.

pgpAxPazfWOQP.pgp
Description: PGP signature