Merge conflicts when keeping a branch up to date with main

Subject of the issue

When creating a PR off of main to be merged into a production branch we get a ton of merge conflicts. Ideally this would not be the case but I’m not sure what we’re doing wrong or if there is even a way to avoid this. Not sure this is a bug with this action or just something we’ll have to deal with every-time we want to merge our main branch into production. Thanks for the help!

Steps to reproduce

Our github action code:

productionPromotion:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
        with:
          ref: production
      - name: Reset promotion branch
        run: |
          git fetch origin main:main
          git reset --hard main
      - name: Create Pull Request
        uses: peter-evans/create-pull-request@v4
        with:
          branch: production-promotion

If this issue is describing a possible bug please provide (or link to) your GitHub Actions workflow.

[Gabe1203]

Thanks for the response! Ended up having to modify the reset promotion branch step a bit to but this works great now:

steps:
      - uses: actions/checkout@v3
        with:
          ref: production
      - name: Reset promotion branch
        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

[denik1981]

Yes, it does, but I’m not sure why you need the same branch twice if they won’t differ in anything. You could use master as your production branch for this matter. IDK, you sure have your reasons.