[CakeML-dev] .lem files in the semantics

Scott Owens S.A.Owens at kent.ac.uk
Wed Dec 7 15:57:27 UTC 2016

Can we put a moratorium on modifying the .lem files of the master branch until after the env-refactor branch is merged. Merging master into env-refactor creates a bunch of conflicts when this has happened. It is especially bad for the .lem files in the proofs subdirectory where the env-refactor branch no longer uses .lem files. The changes are at a real risk of being lost as the only practical way to resolve the conflicts is with a git checkout —ours followed by an attempt to re-apply the changes.


More information about the Developers mailing list