Skip to content

Conversation

@mpatlasov
Copy link
Contributor

The command cherry-picks commit with given hash into current branch by means of patch -p1.

Sometimes ordinary git cherry-pick <commit_hash> fails with:

CONFLICT (content): Merge conflict in <some_file>

while patch -p1 succeeds. The new command automate cherry-picking by patch -p1. Example of output is in the first commit of this PR.

@openshift-ci openshift-ci bot requested review from enxebre and stbenjam October 23, 2025 00:38
The command cherry-picks commit with given hash into current branch by means of `patch -p1`.
@mpatlasov mpatlasov force-pushed the add-git-cherry-pick branch from 258a375 to 3709cfa Compare October 23, 2025 15:20
@mpatlasov
Copy link
Contributor Author

Last force-push addresses:

  • Command format in the Name section
  • Command format in the Synopsis section
  • New section Arguments added
  • The file with command is renamed accordingly

`patch -p1 --no-backup-if-mismatch`, and then commit changes with commit message
from `commit_hash` commit.

## Workflow
Copy link
Contributor

Choose a reason for hiding this comment

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

We are calling this ##Implementation by convention where workflow could be ###

@enxebre
Copy link
Contributor

enxebre commented Oct 24, 2025

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 24, 2025
@openshift-ci
Copy link

openshift-ci bot commented Oct 24, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre, mpatlasov

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

The pull request process is described here

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 24, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 2027cfb into openshift-eng:main Oct 24, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants