Skip to content

Add make force-bump target#516

Merged
openshift-merge-bot[bot] merged 1 commit intoopenstack-k8s-operators:mainfrom
dprince:force-bump
Apr 11, 2025
Merged

Add make force-bump target#516
openshift-merge-bot[bot] merged 1 commit intoopenstack-k8s-operators:mainfrom
dprince:force-bump

Conversation

@dprince
Copy link
Contributor

@dprince dprince commented Apr 10, 2025

Jira: OSPRH-15738

Jira: OSPRH-15738
@openshift-ci openshift-ci bot requested review from lewisdenny and rabi April 10, 2025 18:57
Copy link
Contributor

@stuggi stuggi left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 11, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dprince, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 46da31c into openstack-k8s-operators:main Apr 11, 2025
7 checks passed
@dprince
Copy link
Contributor Author

dprince commented May 5, 2025

/cherry-pick 18.0-fr2

@openshift-cherrypick-robot

@dprince: #516 failed to apply on top of branch "18.0-fr2":

Applying: Add make force-bump target
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add make force-bump target

Details

In response to this:

/cherry-pick 18.0-fr2

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-sigs/prow repository.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants