Skip to content
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

House keeping: tidying everything #4

Merged
merged 8 commits into from
Feb 20, 2024
Merged

Conversation

oliver-butterley
Copy link
Collaborator

  • Split lean code into separate files
  • Streamline github action
  • Add vscode nice settings
  • Bump lean version and make required correction to one proof
  • Etc

@oliver-butterley
Copy link
Collaborator Author

I suggest the "Squash and merge" commit method to reduce the main history.

@mseri
Copy link
Owner

mseri commented Feb 20, 2024

Nice! Thanks. As per the merge: Do we really care about having a such a concise history when your commits are already so explicative? I’d be actually inclined in merging with a merge commit

@oliver-butterley
Copy link
Collaborator Author

I feel we are saying the same thing but with different words... Most importantly, I don't have a strong point of view on this, this is a minor preference I have.
With a squash and merge the PR commits are squashed into a single commit. Instead of seeing all of a contributor's individual commits from a topic branch, the commits are combined into one commit and merged into main.
This has the benefit of keeping the commit history in the main repo a bit cleaner. With a normal merge all the commits from the PR are added to the commit history.

@mseri
Copy link
Owner

mseri commented Feb 20, 2024

Yes I know the difference, I meant that I in general like to see the breakdown of the history :) I tend to use squash and merge only when the PR is messy

@mseri
Copy link
Owner

mseri commented Feb 20, 2024

I assume the license is apache to fit in with lean/mathlib one

README.md Show resolved Hide resolved
@oliver-butterley
Copy link
Collaborator Author

I assume the license is apache to fit in with lean/mathlib one

Yes, licence is there apache license, identical to mathlib. I don't want to ever think about legal things but I understand that such is useful to guarantee the code is a always free in the future.

@oliver-butterley
Copy link
Collaborator Author

Yes I know the difference, I meant that I in general like to see the breakdown of the history :) I tend to use squash and merge only when the PR is messy

Yes, actually that makes good sense.

@mseri mseri merged commit 12e7c93 into mseri:main Feb 20, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants