Commit e86f0e1
committed
Add merge commit to be picked as single commit
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 <[email protected]>1 parent 1185738 commit e86f0e1
1 file changed
+1
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
541 | 541 | | |
542 | 542 | | |
543 | 543 | | |
| 544 | + | |
544 | 545 | | |
545 | 546 | | |
546 | 547 | | |
| |||
0 commit comments