search

JacquesCarette / hol-light-qe

The HOL Light theorem prover (moved from Google code)
Other
7 stars 1 forks source link

fourth batch #17

Closed sjjs7 closed 4 years ago

sjjs7 commented 4 years ago

These are also good to go if the conflicts again don't require me to change anything.

JacquesCarette commented 4 years ago

Conflicts again. In part because you're still working directly on master, so it makes the patch be "from the start" (128 commits!!!) instead of the just the latest batch. Can you try to fix this?

sjjs7 commented 4 years ago

Yes, I see.

sjjs7 commented 4 years ago

Actually that is the latest batch. I made this one bigger because it had a lot of PR's in them which appear as 2 commits but they really only make 1 change. Also every time I do a merge commit it shows as a commit (as you can see) which is quite annoying, but also makes the number of commits looks larger than they are.

That being said, can I go ahead and fix these conflicts?

JacquesCarette commented 4 years ago

Yes, go ahead.

sjjs7 commented 4 years ago

Good to merge.