We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 63fbc49 commit 85ff3c3Copy full SHA for 85ff3c3
.github/workflows/update-subtree.yml
@@ -185,6 +185,7 @@ jobs:
185
-c user.name=gitbot -c user.email=git@bot \
186
merge -Xsubtree=library subtree/library; then
187
echo "MERGE_CONFLICTS=yes" >> $GITHUB_ENV
188
+ git submodule update --init
189
git submodule foreach 'grep $sm_path $toplevel/../submodule-heads | cut -f1 -d" " | xargs git checkout'
190
git -c user.name=gitbot -c user.email=git@bot commit -a -m "Merge from $NEXT_COMMIT_HASH with conflicts"
191
else
0 commit comments