From 513588effe508eaf81879d62ef08b6fb6a238c48 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 21 Jul 2021 03:44:15 +0200
Subject: [PATCH] pkd/debian: Use 'git am -3' to fix some conflicts

---
 .github/workflows/debian.yml     | 4 ++--
 .github/workflows/debian_lts.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 27b343753..c69733264 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -49,7 +49,7 @@ jobs:
 
         # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          git am ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .
@@ -57,7 +57,7 @@ jobs:
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          git am < ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .
diff --git a/.github/workflows/debian_lts.yml b/.github/workflows/debian_lts.yml
index 87d5f3976..7f5788d72 100644
--- a/.github/workflows/debian_lts.yml
+++ b/.github/workflows/debian_lts.yml
@@ -49,7 +49,7 @@ jobs:
 
         # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          git am ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .
@@ -57,7 +57,7 @@ jobs:
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          git am ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .