Skip to content

Commit e86f0e1

Browse files
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

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

artifacts/scripts/util.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,7 @@ function pick-merge-as-single-commit() {
541541
69bd30507559be3dea905686b46bc3295c951f45
542542
64718f678695884c93d6d3df8f5799614746bea2
543543
bc53b97ceb25338570a853845c4cdd295468ed61
544+
119f114f012ae6d1cd851bdb2c3f849307e83258
544545
EOF
545546
}
546547

0 commit comments

Comments
 (0)