Add merge commit to be picked as single commit #456
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/XS
akhilerm
changed the title
This is done because kubernetes/kubernetes#128196 has changes split across multiple commits. One of the commits kubernetes/kubernetes@81cd728 causes a conflict with kubernetes/kubernetes@0cad1a8 while cherry-picking, which is done for linearizing history. This, however, doesn't occur while picking the merge commit as a single commit because kubernetes/kubernetes@9274a58 fixes the conflict and thus the changes are nullified across the commits in the PR. So we add the merge commit kubernetes/kubernetes@119f114 to be processed separately and picked as a single commit. Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
akhilerm
force-pushed
the
add-merge-as-single-commit
branch
from
d533a86 to
e86f0e1
Compare
|
/test pull-publishing-bot-test-kubernetes-master |
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
|
/cc @dims |
|
/approve thanks @akhilerm !! |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: akhilerm, dims 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 |
k8s-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is done because kubernetes/kubernetes#128196 has changes split across multiple commits. One of the commits kubernetes/kubernetes@81cd728 causes a conflict with kubernetes/kubernetes@0cad1a8 while cherry-picking, which is done for linearizing history. This, however, doesn't occur while picking the merge commit as a single commit because kubernetes/kubernetes@9274a58 fixes the conflict and thus the changes are nullified across the commits in the PR. So we add the merge commit kubernetes/kubernetes@119f114 to be processed separately and picked as a single commit.