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: fix some comments #2017

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: fix some comments #2017

wants to merge 1 commit into from

Conversation

majorteach
Copy link

No description provided.

Signed-off-by: majorteach <[email protected]>
@majorteach majorteach requested a review from a team as a code owner March 23, 2024 08:55
@majorteach majorteach requested review from hdonnay and removed request for a team March 23, 2024 08:55
@app-sre-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@majorteach
Copy link
Author

@hdonnay

friendly ping~

@hdonnay
Copy link
Member

hdonnay commented Apr 9, 2024

LGTM pending a rebase.

rebase steps

Just adding a note here in case you're unfamiliar with a rebase workflow.
Conceptually, you're just taking your commits and applying the diff to the current main instead of where they were originally committed.
Assuming origin is the quay/clair repo, and fork is your fork:

  1. git checkout BRANCH_NAME
  2. git fetch origin
  3. git rebase origin/main
  4. git push --force-with-lease fork

If you get a merge conflict in the rebase step, just replace the conflict block with the code you think should be there. If something's wrong, we'll catch it. If it's for an autogenerated file like go.sum, just recreate it.

If we asked you to change a commit message, add the -i flag to the rebase command and use the reword command.

Sorry for letting a very simple (and welcome!) change languish.

@majorteach
Copy link
Author

Anything need I to do? If have, Please feel free to tell me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants