Commit 7d67ff69 authored by Carlo Landmeter's avatar Carlo Landmeter

build: apply patches 3way

parent f51068b2
......@@ -96,7 +96,7 @@ setup_system() {
create_workspace() {
msg "Cloning aports and applying PR$PR"
git clone --depth=1 --branch "$BRANCH" "$REPOURL" "$APORTSDIR"
wget -qO- "$REPOURL"/pull/"$PR".patch | git -C "$APORTSDIR" am
wget -qO- "$REPOURL"/pull/"$PR".patch | git -C "$APORTSDIR" am --3way
}
sysinfo() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment