sync: fix upstream conflicts

Co-authored-by: royjr <royjr96@gmail.com>
This commit is contained in:
royjr
2026-07-16 01:04:49 -04:00
committed by Jason Wen
parent 14318d2f09
commit 560cde61ae
380 changed files with 357 additions and 665 deletions
+2 -1
View File
@@ -102,7 +102,8 @@ done
RUN=$([ -z "$RUN" ] && echo "" || echo "!($(echo $RUN | sed 's/ /|/g'))")
SKIP="@($(echo $SKIP | sed 's/ /|/g'))"
GIT_FILES="$(git ls-files openpilot)"
IGNORED_DIRS="^openpilot/third_party/.*"
GIT_FILES="$(git ls-files openpilot | grep -vE "$IGNORED_DIRS")"
ALL_FILES=""
for f in $GIT_FILES; do
if [[ -f $f ]]; then