From bbe442da7a5e89b1f8bdbac4968f09e05b24bf5d Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko Date: Tue, 25 Aug 2020 00:19:10 -0700 Subject: [PATCH] sync: allow 3-way merge for patching to simplify manual conflict resolution Allowing --3way leaves conflicts in the local files, which makes manual conflict resolution so much easier. Signed-off-by: Andrii Nakryiko --- scripts/sync-kernel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sync-kernel.sh b/scripts/sync-kernel.sh index deccd06..4d078fb 100755 --- a/scripts/sync-kernel.sh +++ b/scripts/sync-kernel.sh @@ -237,7 +237,7 @@ cd_to ${LIBBPF_REPO} git checkout -b ${LIBBPF_SYNC_TAG} for patch in $(ls -1 ${TMP_DIR}/patches | tail -n +2); do - if ! git am --committer-date-is-author-date "${TMP_DIR}/patches/${patch}"; then + if ! git am --3way --committer-date-is-author-date "${TMP_DIR}/patches/${patch}"; then read -p "Applying ${TMP_DIR}/patches/${patch} failed, please resolve manually and press to proceed..." fi done