Fix GitHub to GitLab Sync: (#12)

* test-trigger

* test

* qa push validation

* test qa push

* validate

* test

Author: Karthick-Elumalai

.github/workflows/sync-github-to-gitlab.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout GitHub Repository
         uses: actions/checkout@v2
         with:
-          fetch-depth: 0  # Fetch the full history to ensure full context
+          fetch-depth: 0  # Fetch full history for context
 
       # Step 2: Configure Git identity
       - name: Configure Git Identity
@@ -37,18 +37,15 @@ jobs:
       - name: Fetch GitLab qa branch
         run: git fetch gitlab qa || true  # Ensure GitLab qa branch is fetched
 
-      # Step 6: Reconcile Divergent Histories
-      - name: Reconcile Divergent Histories
+      # Step 6: Checkout GitLab qa branch
+      - name: Checkout GitLab qa branch
         run: |
-          # Checkout the current branch
-          git checkout main
+          git checkout qa || git checkout -b qa gitlab/qa
 
-          # Merge GitLab qa branch into GitHub main branch, allowing unrelated histories
-          git merge gitlab/qa --allow-unrelated-histories --strategy-option=theirs || true
+      # Step 7: Merge GitHub main into GitLab qa
+      - name: Merge GitHub main into GitLab qa
+        run: git merge origin/main --allow-unrelated-histories --strategy-option=theirs || true
 
-          # Force push to GitLab if necessary
-          git push gitlab qa || git push --force gitlab qa
-
-      # Step 7: Push Final Changes to GitLab qa branch
+      # Step 8: Push only to GitLab qa
       - name: Push Final Changes to GitLab qa branch
-        run: git push gitlab main:qa
+        run: git push gitlab qa