Deleting Files in Follower Branch

Deleting Files in Follower Branch

We have been using this action to keep main in sync with staging branch each night. This is working great for new and modified files.

Recently, we noticed that files deleted in the main branch are not deleted in the staging branch.

How can we ensure that files deleted in main are also deleted in staging?

Steps to reproduce

We are using the action as follows:

name: sync-changes-on-main-to-staging
on: [workflow_dispatch]

jobs:
  sync-changes-on-main-to-staging:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
        with:
          ref: staging

      - name: Set Git Configs
        run: |
          git config user.name "GitHub Actions Bot"
          git config user.email "<>"
          git fetch origin main:main
          git merge main -X theirs --allow-unrelated-histories

      - name: Create Pull Request
        id: cpr
        uses: peter-evans/create-pull-request@v4
        with:
          title: "Merge main to staging"
          branch: staging-promotion
          delete-branch: true
          token: ${{ secrets.PAT }}

[skeep-exogee]

Thanks @peter-evans for your help this is working:

     - name: Reset promotion branch
        run: |
          git config user.name "GitHub Actions Bot"
          git config user.email "<>"
          git config pull.rebase true
          git fetch origin main:main
          git reset --hard main
          git pull -X theirs

[skeep-exogee]

hmmm I get a different output on the github action

Run git config user.name "GitHub Actions Bot"
  git config user.name "GitHub Actions Bot"
  git config user.email "<>"
  git fetch origin main:main
  git merge main -X theirs --allow-unrelated-histories
  git status
  shell: /usr/bin/bash -e {0}
From https://github.com/skeep-exogee/test-actions
 * [new branch]      main       -> main
 * [new branch]      main       -> origin/main
Merge made by the 'ort' strategy.
On branch staging
Your branch is ahead of 'origin/staging' by [4](https://github.com/skeep-exogee/test-actions/actions/runs/3746192452/jobs/6361313598#step:3:4)4 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean