Skip to content

Merging to release-5.12.1: [TT-16966][TT-16971] Fix ci/tests/specs Error: Cannot find module 'tslib' and policies schema (#7995)#8063

Closed
probelabs[bot] wants to merge 1 commit intorelease-5.12.1from
merge/release-5.12.1/3f2cfae90eabe18e37412948b34f2c7b746c990d/TT-16966
Closed

Merging to release-5.12.1: [TT-16966][TT-16971] Fix ci/tests/specs Error: Cannot find module 'tslib' and policies schema (#7995)#8063
probelabs[bot] wants to merge 1 commit intorelease-5.12.1from
merge/release-5.12.1/3f2cfae90eabe18e37412948b34f2c7b746c990d/TT-16966

Conversation

@probelabs
Copy link
Copy Markdown
Contributor

@probelabs probelabs Bot commented Apr 17, 2026

Cherry-pick of 3f2cfae90eabe18e37412948b34f2c7b746c990d from master to release-5.12.1 requires manual resolution.

Conflicts detected: 3

  • user/policy.go

Tips:

  • Check out this branch locally and run: git cherry-pick -x 3f2cfae90eabe18e37412948b34f2c7b746c990d
  • Resolve conflicts (including submodules if any), then push back to this branch.

Original commit: 3f2cfae

    Cherry-pick failed with conflicts and requires manual resolution.
    This empty commit exists to allow opening a draft PR.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-manual-cherry-pick Cherry-pick has conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant