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