@@ -219,6 +219,13 @@ jobs:
219
219
git config merge.theirs.driver 'cat %B > %A'
220
220
GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories
221
221
222
+ # Copy files from `production` branch if necessary:
223
+ git checkout origin/production -- .
224
+ if [ -n "$(git status --porcelain)" ]; then
225
+ git add -A
226
+ git commit -m "Auto-generated commit"
227
+ fi
228
+
222
229
# If `deno` does not exist, create `deno` branch:
223
230
- name : ' If `deno` does not exist, create `deno` branch'
224
231
if : ${{ steps.deno-branch-exists.outputs.remote-exists == false }}
@@ -385,6 +392,13 @@ jobs:
385
392
git config merge.theirs.driver 'cat %B > %A'
386
393
GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories
387
394
395
+ # Copy files from `production` branch if necessary:
396
+ git checkout origin/production -- .
397
+ if [ -n "$(git status --porcelain)" ]; then
398
+ git add -A
399
+ git commit -m "Auto-generated commit"
400
+ fi
401
+
388
402
# If `umd` does not exist, create `umd` branch:
389
403
- name : ' If `umd` does not exist, create `umd` branch'
390
404
if : ${{ steps.umd-branch-exists.outputs.remote-exists == false }}
@@ -549,6 +563,13 @@ jobs:
549
563
git config merge.theirs.driver 'cat %B > %A'
550
564
GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories
551
565
566
+ # Copy files from `production` branch if necessary:
567
+ git checkout origin/production -- .
568
+ if [ -n "$(git status --porcelain)" ]; then
569
+ git add -A
570
+ git commit -m "Auto-generated commit"
571
+ fi
572
+
552
573
# If `esm` does not exist, create `esm` branch:
553
574
- name : ' If `esm` does not exist, create `esm` branch'
554
575
if : ${{ steps.esm-branch-exists.outputs.remote-exists == false }}
0 commit comments