fixing conflict

Keep all existing changes
Create a merge commit if there are conflicts
Preserve the commit history of both branches
Include all changes in the final push

Author: brown9804

.github/workflows/validate_and_fix_markdown.yml

@@ -18,6 +18,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.head_ref || github.ref_name }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -35,12 +36,23 @@ jobs:
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
 
-      - name: Commit and rebase changes
+      - name: Commit and merge changes
         env:
           PR_BRANCH: ${{ github.head_ref || github.ref_name }}
+          GIT_AUTHOR_NAME: github-actions[bot]
+          GIT_AUTHOR_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_COMMITTER_NAME: github-actions[bot]
+          GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
         run: |
-          git pull origin "$PR_BRANCH" || echo "Failed to pull latest changes"
+          # Ensure we're on the correct branch
+          git switch -c "$PR_BRANCH" || git switch "$PR_BRANCH"
+          
+          # Stage and commit changes if any
           git add -A
-          git commit -m "Fix Markdown syntax issues" || echo "No changes to commit"
-          git pull --rebase origin "$PR_BRANCH" || echo "No rebase needed"
-          git push origin HEAD:"$PR_BRANCH"
+          git diff --staged --quiet || git commit -m "Fix Markdown syntax issues"
+          
+          # Pull and merge existing changes
+          git pull origin "$PR_BRANCH" --no-rebase
+          
+          # Push all changes
+          git push origin "$PR_BRANCH"