diff --git a/.github/workflows/keep-config-intact.yml b/.github/workflows/keep-config-intact.yml deleted file mode 100644 index f8df384..0000000 --- a/.github/workflows/keep-config-intact.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Protect branch-specific files -on: - pull_request: - branches: - - main - - test - types: [opened, synchronize, reopened] -permissions: - contents: write - pull-requests: write -jobs: - restore-config: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref }} - fetch-depth: 0 - - - name: Restore target branch's _config.yml - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - # Get the target branch (main or test) - TARGET_BRANCH="${{ github.base_ref }}" - - # Get target branch's version of _config.yml - git fetch origin "$TARGET_BRANCH" - git show "origin/$TARGET_BRANCH:_config.yml" > /tmp/target_config.yml - - # Compare with current version - if ! cmp -s _config.yml /tmp/target_config.yml; then - echo "Restoring $TARGET_BRANCH's _config.yml to PR branch" - cp /tmp/target_config.yml _config.yml - git add _config.yml - git commit -m "chore: restore $TARGET_BRANCH's _config.yml [automated]" - git push - else - echo "✓ _config.yml already matches $TARGET_BRANCH's version" - fi \ No newline at end of file diff --git a/_config.yml b/_config.yml index 9098fdb..2a3758a 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,7 @@ theme: just-the-docs +# If issues with merging of this file occur in the future, please run the following command in a terminal: +# git config merge.ours.driver true baseurl: /Digital-Interfaces/test # For test branch: /repository-name/test #theme: just-the-docs