-
Notifications
You must be signed in to change notification settings - Fork 3
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
Add a codespell action to keep it clean of future typos #1
Conversation
Sorry to have missed this PR. I didn't get an email notification for some reason. My preference is to do one PR per change. (I've already fixed the typo, thanks for finding that.) |
No worries.
Okay, do you want me to cherry-pick that commit out?
Perhaps you haven't pushed then, it's still there currently: |
That’s correct, I haven’t pushed yet. |
Resync with master
This is now just a single change PR @ssilverman . |
Bump @ssilverman |
Question: Will this action prevent a merge or just show some notification if there's a typo? Also, could you squash this into a single commit? Only one file is changed, but there are 4 commits. My workflow is to do a rebase for linear history. (I know there's other approaches.) |
That depends how/whether you configure branch protection: If you do nothing, this will just add an annotation against any PRs, like so: As well as tick/cross status against commits: But with branch protection you can, if you want, only allow either PRs (or pushes too) to be merged when there are no spelling errors, to keep the branch clean. I'd say this will be particularly important for the validation PRs #6 #8 and #9 so you don't end up with broken JSON being merged in future. You can also add words to skip: Or if necessary, files:
See the discussion elsewhere...
One added the action, one fixed the typo (which I think you'd already fixed but not pushed at the time) and the other two were resyncing to try and get that fix in). |
I think I see why more commits are being added. When I refer to "combining commits", I'm thinking of "interactive rebasing" and literally combining commits, not merging them. For example, if there's a few commits that only result in one file, you can use interactive rebase with the "f" command:
|
@peternewman Would you like to hop on a screen sharing call and we can get all your changes in together? I'd really like to get your fixes and additions in. |
See #6 (comment) I'm pretty certain that will keep you happy! I think this is the web version of fix-up.
Thanks for the offer, unfortunately now doesn't work too well for me, I'm not really free for something like that until in a weeks time. |
Hi @ssilverman , Is #10 acceptable for you to merge instead of this? Otherwise I should be able to fit in a screen sharing call at some point over the next few weeks if you really feel we need one. Do you want to drop me an email with some dates that work for you (if you've still got my email)? |
Merged as a GitHub squash via #10. |
No description provided.