Skip to content

Conversation

@garak
Copy link
Collaborator

@garak garak commented Sep 23, 2025

@garak garak requested a review from stof September 23, 2025 10:17
@garak garak changed the base branch from master to v2 September 23, 2025 10:21
@garak garak changed the base branch from v2 to master September 23, 2025 10:21
@garak garak requested a review from Copilot September 23, 2025 10:22
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR corrects a grammatical error in the documentation by fixing subject-verb agreement.

  • Fixes grammatical error where "becomes" should be "become" to match the plural subject "menus"

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@garak
Copy link
Collaborator Author

garak commented Sep 23, 2025

I tried to rebase, yet a few irrelevant commits are shown in this PR. I'm confident they will be ignored after the merge (squash merging shouldn't be necessary)

@stof
Copy link
Collaborator

stof commented Sep 23, 2025

@garak those commits are not in the history of the master branch. We have similar commit messages but with different hashes:
image

you should use git rebase --onto master 47b4ec5bddef40c5fb5e0e01b15ff9f2d077a5b4 to rebase only your latest commit onto master instead of rebasing also the commit and its revert.

@garak
Copy link
Collaborator Author

garak commented Sep 24, 2025

you should use git rebase --onto master 47b4ec5bddef40c5fb5e0e01b15ff9f2d077a5b4 to rebase only your latest commit onto master instead of rebasing also the commit and its revert.

I followed your suggestion:

$ git rebase --onto master 47b4ec5
$ git push --force-with-lease

but the situation didn't improve

@stof
Copy link
Collaborator

stof commented Sep 24, 2025

Was your master branch up-to-date ?

@garak
Copy link
Collaborator Author

garak commented Sep 24, 2025

Was your master branch up-to-date ?

I found out that git fetch upstream && git merge upstream/master wasn't enough, so I reset my fork. Now it looks good.

@garak garak added hacktoberfest-accepted https://hacktoberfest.digitalocean.com and removed hacktoberfest-accepted https://hacktoberfest.digitalocean.com labels Oct 31, 2025
@shakaran
Copy link
Contributor

shakaran commented Dec 9, 2025

@stof could you merge this? Thanks

@stof stof merged commit ed428cf into KnpLabs:master Dec 9, 2025
11 checks passed
@garak garak deleted the fix-wording-fix branch December 9, 2025 11:13
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.

4 participants