mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-02-18 20:03:53 +08:00
three way merge
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user