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: Remove commented code #882

Merged
merged 1 commit into from
Jan 21, 2024

Conversation

harishsurf
Copy link
Contributor

Remove commented code that accidentally got merged in #853

@harishsurf
Copy link
Contributor Author

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 0cc5168 into quay:master Jan 21, 2024
11 checks passed
@harishsurf
Copy link
Contributor Author

/cherry-pick redhat-3.10

@openshift-cherrypick-robot

@harishsurf: #882 failed to apply on top of branch "redhat-3.10":

Applying: chore: Remove commented code
Using index info to reconstruct a base tree...
M	.gitignore
M	controllers/quay/features.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/quay/features.go
CONFLICT (content): Merge conflict in controllers/quay/features.go
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: Remove commented code
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick redhat-3.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@harishsurf
Copy link
Contributor Author

/cherry-pick redhat-3.10

@openshift-cherrypick-robot

@harishsurf: new pull request created: #884

In response to this:

/cherry-pick redhat-3.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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.

None yet

3 participants