[PECOBLR-849] Fix JDBC Comparator workflow (#986)

## Description
<!-- Provide a brief summary of the changes made and the issue they aim
to address.-->
The comparator workflow was not working since it was not able to resolve
the merge conflicts. Updated the workflow to apply the incoming changes
always in case of merge conflicts.
## Testing
<!-- Describe how the changes have been tested-->
Tested the command locally
## Additional Notes to the Reviewer
<!-- Share any additional context or insights that may help the reviewer
understand the changes better. This could include challenges faced,
limitations, or compromises made during the development process.
Also, mention any areas of the code that you would like the reviewer to
focus on specifically. -->
NO_CHANGELOG=true

Author: msrathore-db

.github/workflows/runJdbcComparator.yml

@@ -26,10 +26,11 @@ jobs:
       - name: Merge main into jdbc-comparator
         run: |
           git checkout jdbc-comparator
-          git merge main --no-edit || {
-            echo "Merge conflict occurred"
-            git merge --abort
-            exit 1
+          git merge main --allow-unrelated-histories --no-edit -X theirs || {
+            echo "Force merging by accepting all changes from main"
+            git checkout --theirs .
+            git add .
+            git commit --no-edit
           }
 
       - name: Set up JDK 11