From ea78541674ff5d9c9e673c8a2443043826ada194 Mon Sep 17 00:00:00 2001
From: Chris <filmee24@gmail.com>
Date: Sat, 12 Oct 2024 18:22:18 +0200
Subject: [PATCH] Update pack.yaml

---
 .github/workflows/pack.yaml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/pack.yaml b/.github/workflows/pack.yaml
index 449a9b1..d2157fe 100644
--- a/.github/workflows/pack.yaml
+++ b/.github/workflows/pack.yaml
@@ -68,14 +68,13 @@ jobs:
         run: |
           dotnet nuget push ./nuget/*.nupkg --api-key "${{ secrets.NUGET_APIKEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate
 
-      - name: Commit changes
-        uses: EndBug/add-and-commit@v9
-        with:
-          author_name: github-actions[bot]
-          author_email: github-actions[bot]@users.noreply.github.com
-          message: "Update version to ${{ env.RELEASE_VERSION }}"
-          push: true
-          new_branch: update-version
-          add: '["Source/Silverfly/Silverfly.csproj", "Source/Silverfly.Testing/Silverfly.Testing.csproj", "Source/Silverfly.Generator/Silverfly.Generator.csproj", "Source/Silverfly.Repl/Silverfly.Repl.csproj","Source/Silverfly.TreeVisualizer/Silverfly.TreeVisualizer.csproj"]'
-
-
+      - name: GIT commit and push docs overriding conflicts with local changes (verbose)
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add Source/*.csproj
+          git commit -m "Update version to ${{ env.RELEASE_VERSION }}"
+          git fetch origin
+          git rebase --strategy-option=theirs origin/main
+          git push
+