auto-merge-from-dev-server-to-dev.yml

name: Auto merge to dev
on:
  push:
    branches:
      - dev-server

jobs:
  merge:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v2
        with:
          fetch-depth: 0

      - name: Setup Git
        run: |
          git config --global user.email "actions@github.com"
          git config --global user.name "GitHub Actions"

      - name: Merge and Push
        run: |
          git checkout dev
          git merge --no-ff dev-server
          git push origin dev