Skip to content

[PECOBLR-849] Fix JDBC Comparator workflow #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msrathore-db merged 3 commits into from
Sep 9, 2025
Merged

[PECOBLR-849] Fix JDBC Comparator workflow #986

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46ead6a
Fix JDBC Comparator workflow merge conflicts
msrathore-db Sep 8, 2025
7ee78c2
Merge branch 'main' into PECOBLR-849
msrathore-db Sep 8, 2025
938f3ce
Merge branch 'main' into PECOBLR-849
msrathore-db Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/runJdbcComparator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading