-
Notifications
You must be signed in to change notification settings - Fork 23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fight namespace pollution #9
Conversation
faaca5f
to
dac366c
Compare
I'm not sure what github is saying about merge conflicts -- this merges cleanly on my machine. |
I would prefer to keep the non-building files in the repo for the following reasons:
That being said, some of the non-building files are definitely old junk that needs to be removed. So I suggest:
Everything else looks great! You got a merge conflict because I (very) recently changed a file that you moved. It should be trivial to resolve after you pull the latest. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See comment on deleted files.
83da705
to
3abbf86
Compare
3abbf86
to
ab9d502
Compare
I removed ESPADA (issue #11). These files build now:
I was unable to fully fix the following files (issue #12):
These files are still built. But significant chunks of their content are commented out and admitted. |
Nice work. Thanks! |
This is on top of #8.
make -f Makefile.coq src/FCF/FCF.v
make update-_CoqProject
aftergit add
orgit rm
orgit mv
make install
in the main Makefile -- it can still be used directly fromMakefile.coq
, but I would recommend against that anyway..dir-locals.el
(this drops support for outdated versions of ProofGeneral)