From 9024a3bf274108ded20084f76550afb7bf283129 Mon Sep 17 00:00:00 2001 From: Somersault <130008175+Somersault41@users.noreply.github.com> Date: Mon, 29 Jun 2026 01:10:28 +0300 Subject: [PATCH] Delete .github/workflows/sync-upstream.yml --- .github/workflows/sync-upstream.yml | 38 ----------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .github/workflows/sync-upstream.yml diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml deleted file mode 100644 index a73a6126..00000000 --- a/.github/workflows/sync-upstream.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Sync Upstream - -on: - schedule: - - cron: "0 * * * *" # Her saat başı çalışır - workflow_dispatch: # İstersen elle de çalıştırabilirsin - -permissions: - contents: write - -jobs: - sync: - runs-on: ubuntu-latest - - steps: - - name: Checkout fork - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Configure Git - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - - name: Add upstream - run: git remote add upstream https://github.com/MCCTeam/Minecraft-Console-Client.git - - - name: Fetch upstream - run: git fetch upstream - - - name: Merge upstream (upstream wins conflicts) - run: | - git checkout master - git merge upstream/master -X theirs --no-edit - - - name: Push changes - run: git push origin master