From e86f0e1d57630849fabb1d218f28f16e9dd1f63c Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Tue, 29 Oct 2024 20:10:23 +0530 Subject: [PATCH] Add merge commit to be picked as single commit This is done because https://github.com/kubernetes/kubernetes/pull/128196 has changes split across multiple commits. One of the commits https://github.com/kubernetes/kubernetes/pull/128196/commits/81cd728c66d319492bacb4e6a8e29fadd0a46d6e causes a conflict with https://github.com/kubernetes/kubernetes/commit/0cad1a89b6721308746cc1a12f12de31a259a0d3 while cherry-picking, which is done for linearizing history. This, however, doesn't occur while picking the merge commit as a single commit because https://github.com/kubernetes/kubernetes/pull/128196/commits/9274a584b8a30262f05694f773a2523e4ec52920 fixes the conflict and thus the changes are nullified across the commits in the PR. So we add the merge commit https://github.com/kubernetes/kubernetes/commit/119f114f012ae6d1cd851bdb2c3f849307e83258 to be processed separately and picked as a single commit. Signed-off-by: Akhil Mohan --- artifacts/scripts/util.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/artifacts/scripts/util.sh b/artifacts/scripts/util.sh index 5024c6709..406a9b5d5 100755 --- a/artifacts/scripts/util.sh +++ b/artifacts/scripts/util.sh @@ -541,6 +541,7 @@ function pick-merge-as-single-commit() { 69bd30507559be3dea905686b46bc3295c951f45 64718f678695884c93d6d3df8f5799614746bea2 bc53b97ceb25338570a853845c4cdd295468ed61 +119f114f012ae6d1cd851bdb2c3f849307e83258 EOF }