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

chore: Copy-edit Neovim readme #888

Merged
merged 2 commits into from
Nov 25, 2024

Conversation

alerque
Copy link
Collaborator

@alerque alerque commented Nov 22, 2024

This just cleans up a few things to make the Neovim related docs read a bit more naturally. No big deal, but presumably whoever wrote this was not a native English speaker because articles and prepositions were a bit scrambled.

@alerque
Copy link
Collaborator Author

alerque commented Nov 24, 2024

Why add a merge commit from main when there are no conflicts or changes? This just creates clutter in PR history, notifications, and (when you do eventually go to merge) also the squash commit message or merge history. Just because the GH interface has a button for it doesn't need it needs to be or should be clicked in all circumstances. The UI will show you whether there would be any merge conflicts before you attempt to merge.

If there are merge conflicts to be resolved that's another matter entirely of course. Also if there are CI changes or some other relevant thing that needs to be brought into the PR that's sometimes reasonable.

@Myriad-Dreamin
Copy link
Owner

Myriad-Dreamin commented Nov 25, 2024

Why add a merge commit from main when there are no conflicts or changes?

Because this PR was based on the commit that didn't pass the CI (❌), 254c4ce.

Also if there are CI changes or some other relevant thing that needs to be brought into the PR that's sometimes reasonable.

So I merged new changes to get a checked mark (✅) in this PR.

@Myriad-Dreamin Myriad-Dreamin merged commit 709946c into Myriad-Dreamin:main Nov 25, 2024
12 checks passed
@alerque
Copy link
Collaborator Author

alerque commented Nov 25, 2024

Fair enough.

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