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.
Maybe I need to read about git stash?
--Barton