On 8/13/11, Barton Willis <willisb at unk.edu> wrote:
> The files src/share-subdirs.lisp and src/sharefiles.mk are both
> automatically
> generated (by configure), but doing a pull, git complains about these files:
>
> Updating 0c6001a..c8d7c31
> Aborting
> error: Your local changes to the following files would be overwritten by
> merge:
> src/share-subdirs.lisp
> src/sharefiles.mk
> Please, commit your changes or stash them before you can merge.
I think it would be a big help to change the manner in which the
share lists are generated; I find the noise from Git distracting.
Can we have sharefiles.mk.in or something like that from which
an unversioned file sharefiles.mk is generated? Likewise for
share-subdirs.lisp.
best
Robert Dodier