rebase to main after switch

.github/workflows/ci-3p-django-framework.yml

@@ -98,6 +98,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_django-framework
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true

.github/workflows/ci-3p-mariadb-connector-c.yml

@@ -99,8 +99,9 @@ jobs:
         git sparse-checkout list
         ./setup.sh test_mariadb-connector-c/mariadb-connector-c
         git switch ${{ env.TESTTREE }}
-        #git -C ./proxysql switch ${{ env.SHA }}
-        #git -C ./proxysql pull --tags
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true

.github/workflows/ci-3p-mysql-connector-j.yml

@@ -98,6 +98,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_mysql-connector-j/mysql-connector-j
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true

.github/workflows/ci-3p-php-pdo-mysql.yml

@@ -98,6 +98,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_php-pdo-mysql/php-src
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
 
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true

.github/workflows/ci-3p-postgresql.yml

@@ -102,6 +102,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_postgresql/postgresql
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true

.github/workflows/ci-3p-sqlalchemy.yml

@@ -101,6 +101,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_sqlalchemy/sqlalchemy
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
 
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true