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.

Sign up for GitHub

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

Jump to bottom

📖 docs: generate list of carry commits for rebasing #2994

Merged
merged 1 commit into from
Oct 17, 2023
Merged

📖 docs: generate list of carry commits for rebasing #2994

merged 1 commit into from
Oct 17, 2023

Conversation

nikhita
Copy link
Member

@nikhita nikhita commented Jul 13, 2023

Summary

This PR updates the rebase documentation to include a way generate a list of carry commits that need to be considered for rebasing.

This is heavily inspired from the openshift rebase process - https://github.com/openshift/kubernetes/blob/master/REBASE.openshift.md.

This is the list I generated for 1.27 - https://docs.google.com/spreadsheets/d/15k9sih-xBKICuLUHj4HMrqYf60mliaslImqqv6fGSJI/edit?usp=sharing

It mirrors what Andy had generated for the 1.26 rebase - #2772

Related issue(s)

Related to #2986

Release Notes

NONE

@kcp-ci-bot kcp-ci-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has signed the DCO. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 13, 2023
@nikhita
Copy link
Member Author

nikhita commented Jul 13, 2023

/cc @xrstf @rajaskakodkar

@kcp-ci-bot kcp-ci-bot requested a review from xrstf July 13, 2023 07:56
@kcp-ci-bot
Copy link
Contributor

@nikhita: GitHub didn't allow me to request PR reviews from the following users: rajaskakodkar.

Note that only kcp-dev members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @xrstf @rajaskakodkar

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.

@embik
Copy link
Member

embik commented Jul 18, 2023

/retest

tests look flaky, so maybe this will help.

@embik
Copy link
Member

embik commented Oct 9, 2023

/retest

@mjudeikis
Copy link
Contributor

/lgtm
/approve

@kcp-ci-bot kcp-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 17, 2023
@kcp-ci-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1999c6a2fd18ca1bc475ec639d28bb735b88752d

@kcp-ci-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mjudeikis

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

@kcp-ci-bot kcp-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 17, 2023
@kcp-ci-bot kcp-ci-bot merged commit c638fc1 into kcp-dev:main Oct 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xrstf xrstf Awaiting requested review from xrstf

Assignees

@mjudeikis mjudeikis

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has signed the DCO. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nikhita @kcp-ci-bot @embik @mjudeikis