Skip to content

chore: resolve pom.xml merge conflict with main#87

Merged
snehar-nd merged 10 commits into
release-3.7.1from
fix/pom-conflict-resolution
Jun 30, 2026
Merged

chore: resolve pom.xml merge conflict with main#87
snehar-nd merged 10 commits into
release-3.7.1from
fix/pom-conflict-resolution

Conversation

@snehar-nd

Copy link
Copy Markdown
Contributor

Resolves the merge conflict in pom.xml between release-3.7.1 and main.

Keeps <version>3.7.1</version> (discards 3.6.1 from main).

This unblocks PR #86 from merging.

@coderabbitai

coderabbitai Bot commented Jun 30, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: db574627-076f-46d8-b8ef-2ccc20a1640b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@sonarqubecloud

Copy link
Copy Markdown

@snehar-nd snehar-nd merged commit 50d593a into release-3.7.1 Jun 30, 2026
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants