Skip to content
Sync Development to Main

Use GITHUB_TOKEN in GitHub Actions #40

Sign in to view logs

Use GITHUB_TOKEN in GitHub Actions

Use GITHUB_TOKEN in GitHub Actions #40

Workflow file for this run

.github/workflows/sync-development-to-main.yml at 4cde50a
name: Sync Development to Main
on:
push:
branches:
- development
permissions:
contents: write
jobs:
merge:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Git
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
- name: Fetch and Checkout Main
run: |
git fetch origin
git checkout main
- name: Merge Development into Main
run: |
if ! git merge --no-ff development -m "Automated merge from development to main"; then
echo "Merge conflict detected, auto-resolving README.md..."
git checkout main -- README.md 2>/dev/null || git rm README.md 2>/dev/null || true
git add -A
git commit --no-edit
fi
- name: Push Changes
run: git push origin main