three way merge

pull/30678/head^2
Adeeb Shihadeh 2 years ago committed by GitHub
parent 3831bf19e4
commit 702c4392a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      scripts/apply-pr.sh

@ -8,4 +8,4 @@ fi
BASE="https://github.com/commaai/openpilot/pull/"
PR_NUM="$(echo $1 | grep -o -E '[0-9]+')"
curl -L $BASE/$PR_NUM.patch | git apply
curl -L $BASE/$PR_NUM.patch | git apply -3

Loading…
Cancel
Save