Add merge commit to be picked as single commit #209
Merged
Conversation
This file contains 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
kubernetes/kubernetes@bc53b97 is the merge commit. This is done because kubernetes/kubernetes#85464 has changes split across multiple commits and leads to conflicts while linearizing history. This, however, doesn't occur while picking the merge commit as a single commit because the problematic changes are nullified across the commits in the PR.
k8s-ci-robot
added
cncf-cla: yes
|
/approve |
k8s-ci-robot
added
the
lgtm
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dims, nikhita, sttts 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
|
This does not seem to work. I'm travelling tomorrow, but will take a look later. |
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.
kubernetes/kubernetes@bc53b97 is the merge commit.
This is done because kubernetes/kubernetes#85464 has
changes split across multiple commits and leads to conflicts while linearizing
history. This, however, doesn't occur while picking the merge commit as a single commit
because the problematic changes are nullified across the commits in the PR.
/assign @sttts
cc @dims