Skip to content

Commit

Permalink
Update comments and fix typo
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Liu <[email protected]>
  • Loading branch information
NvTimLiu committed Apr 11, 2024
1 parent e5cae76 commit bfb03b6
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ jobs:
git config user.email "[email protected] "
git fetch origin ${HEAD} ${BASE}
git checkout -b ${INTERMEDIATE_HEAD} origin/${HEAD}
# Use commits from HEAD, but keek submodule files(FILE_USE_BASE) from BASE
# Sync the $BASE branch with the commits from the $HEAD branch,
# excluding the paths defined as $FILE_USE_BASE (located under ./thirdparty).
git checkout origin/${BASE} -- ${FILE_USE_BASE}
# If any submodule file is updaged from HEAD, always change to BASE ones
# If any submodule file is updated in the HEAD branch,
# always change it to the corresponding one from the BASE branch.
[ ! -z "$(git status --porcelain=v1 --untracked=no)" ] && \
git commit -s -am "Auto-merge use ${BASE} versions"
git push origin ${INTERMEDIATE_HEAD} -f
Expand Down

0 comments on commit bfb03b6

Please sign in to comment.