pkd/debian: Use 'git am -3' to fix some conflicts
This commit is contained in:
parent
9bfb27f3e8
commit
513588effe
4
.github/workflows/debian.yml
vendored
4
.github/workflows/debian.yml
vendored
|
@ -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 .
|
||||
|
|
4
.github/workflows/debian_lts.yml
vendored
4
.github/workflows/debian_lts.yml
vendored
|
@ -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 .
|
||||
|
|
Loading…
Reference in a new issue