Merge branch 'master' into gh-pages

Author: actions-user

.github/workflows/auto-pr.yml

@@ -1,6 +1,7 @@
 name: Automated PR for merging master into gh-pages
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 0 * * 0' # Runs every Sunday at 00:00
 
@@ -21,8 +22,8 @@ jobs:
       - name: Merge master into gh-pages
         run: |
           git checkout gh-pages
-          git merge --no-edit master || echo "Merge conflict occurred. Aborting the process." && exit 1
-          git push origin gh-pages
+          git merge --no-edit master || echo "Merge conflict occurred. Continuing the process."
+          git push origin gh-pages || echo "Push failed. Continuing the process."
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3

zer0.md

@@ -30,6 +30,8 @@ snippet: What is a snippet?
 comments: true
 ---
 
+testing pr workflow
+
 [![pages-build-deployment](https://github.com/bamr87/it-journey/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/bamr87/it-journey/actions/workflows/pages/pages-build-deployment)
 
 [![Gem Version](https://badge.fury.io/rb/jekyll-theme-zer0.svg)](https://badge.fury.io/rb/jekyll-theme-zer0)