Upmerge Conflict Tests

[jpmcmu]

Type of change:

• This change is a bug fix (non-breaking change which fixes an issue).
• This change is a new feature (non-breaking change which adds functionality).
• This change improves the code (refactor or other change that does not change the functionality)
• This change fixes warnings (the fix does not alter the functionality or the generated code)
• This change is a breaking change (fix or feature that will cause existing behavior to change).
• This change alters the query API (existing queries will have to be recompiled)

Checklist:

• My code follows the code style of this project.
  • My code does not create any new warnings from compiler, build system, or lint.
• The commit message is properly formatted and free of typos.
  • The commit message title makes sense in a changelog, by itself.
  • The commit is signed.
• My change requires a change to the documentation.
  • I have updated the documentation accordingly, or...
  • I have created a JIRA ticket to update the documentation.
  • Any new interfaces or exported functions are appropriately commented.
• I have read the CONTRIBUTORS document.
• The change has been fully tested:
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • I have checked that this change does not introduce memory leaks.
  • I have used Valgrind or similar tools to check for potential issues.
• I have given due consideration to all of the following potential concerns:
  • Scalability
  • Performance
  • Security
  • Thread-safety
  • Cloud-compatibility
  • Premature optimization
  • Existing deployed queries will not be broken
  • This change fixes the problem, not just the symptom
  • The target branch of this pull request is appropriate for such a change.
• There are no similar instances of the same problem that should be addressed
  • I have addressed them here
  • I have raised JIRA issues to address them separately
• This is a user interface / front-end modification
  • I have tested my changes in multiple modern browsers
  • The component(s) render as expected

Smoketest:

• Send notifications about my Pull Request position in Smoketest queue.
• Test my draft Pull Request.

Testing:

[jpmcmu]

Non-Conflicting Test:

[github-actions]

🔄 Upmerge Test Results

Status: ✅ All branches merged successfully
PR: #17 - Upmerge Conflict Tests
Base Branch: candidate-9.12.x
Test Time: 2026-02-27 14:20:52 UTC

✅ Successful Branches (4)

• candidate-9.14.x
• candidate-10.0.x
• candidate-10.2.x
• master
  This comment was automatically generated by the upmerge test workflow.

[jpmcmu]

Conflicting change:

[github-actions]

🔄 Upmerge Test Results

Status: ❌ Conflicts detected
PR: #17 - Upmerge Conflict Tests
Base Branch: candidate-9.12.x
Test Time: 2026-02-27 14:23:04 UTC

How To Resolve❗: Create a PR against conflicting branches and resolve the conflict manually, after the conflicts have been resolved rerun the Upmerge test.

❌ Conflicting Branches (4)

• candidate-9.14.x
• candidate-10.0.x
• candidate-10.2.x
• master
  This comment was automatically generated by the upmerge test workflow.

[jpmcmu]

Test after permissions update. (Expect upmerge failure, but should see a post)

[github-actions]

🔄 Upmerge Test Results

Status: ❌ Conflicts detected
PR: #17 - Upmerge Conflict Tests
Base Branch: candidate-9.12.x
Test Time: 2026-03-05 04:15:14 UTC

How To Resolve❗: Create a PR against conflicting branches and resolve the conflict manually, after the conflicts have been resolved rerun the Upmerge test.

❌ Conflicting Branches (4)

• candidate-9.14.x
• candidate-10.0.x
• candidate-10.2.x
• master
  This comment was automatically generated by the upmerge test workflow.