From e5a665b29f5114b0f180cd161293c4fc151b2ede Mon Sep 17 00:00:00 2001 From: Pablo2048 Date: Sat, 12 Oct 2024 15:29:01 +0200 Subject: [PATCH 1/2] Access token to GA --- update_dev.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update_dev.sh b/update_dev.sh index e06badd..b409fff 100644 --- a/update_dev.sh +++ b/update_dev.sh @@ -17,8 +17,8 @@ fi # Stáhni nejnovější změny z development větve git pull origin development -# Proveď merge z main do development -git merge main +# Proveď merge z main do development s povolením nesouvisejících historií +git merge main --allow-unrelated-histories # Pushni změny do vzdálené development větve git push origin development From f7494799b9fcc8fb7899e350fc2daf8454a5731b Mon Sep 17 00:00:00 2001 From: Pablo2048 Date: Sat, 12 Oct 2024 15:29:18 +0200 Subject: [PATCH 2/2] GA update --- .github/workflows/sync-main-to-dev.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sync-main-to-dev.yml b/.github/workflows/sync-main-to-dev.yml index c764579..4aa369b 100644 --- a/.github/workflows/sync-main-to-dev.yml +++ b/.github/workflows/sync-main-to-dev.yml @@ -12,6 +12,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + with: + # Tento token zajišťuje oprávnění k zápisu + token: ${{ secrets.GITHUB_TOKEN }} - name: Set executable permissions run: chmod +x ./update_dev.sh