Skip to content

Conversation

@meiersi-da
Copy link
Contributor

@dfordivam and myself found that using the branch-protected integration branch feature-cip-73 is rather difficult, as keeping it up to date requires regular merge commits via PRs. The approach @dfordivam and myself are thus trying out is

  • for him to manage the integration branch in the obsidian repo: https://github.com/obsidiansystems/canton-splice/tree/dn/feature-cip-73
    • thus enabling him to use rebasing as needed and when needed without my involvement
  • for me to force push his changes to this Draft PR, so that
    • he gets CI results for his integration branch
    • we can use my branch as the PR target for his review requests

Pull Request Checklist

Cluster Testing

  • If a cluster test is required, comment /cluster_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.
  • If a hard-migration test is required (from the latest release), comment /hdm_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.

PR Guidelines

  • Include any change that might be observable by our partners or affect their deployment in the release notes.
  • Specify fixed issues with Fixes #n, and mention issues worked on using #n
  • Include a screenshot for frontend-related PRs - see README or use your favorite screenshot tool

Merge Guidelines

  • Make the git commit message look sensible when squash-merging on GitHub (most likely: just copy your PR description).

@meiersi-da meiersi-da force-pushed the meiersi/dn/feature-cip-73 branch from 2c829da to 0f126e6 Compare November 14, 2025 15:32
PR reviewed in #2903
CI run #3093

Squash commit created by rebasing 5e8d90e7f over f47f017

Signed-off-by: Divam <[email protected]>
And deprecate AmuletRules_ClaimExpiredRewards

PR reviewed in #3181
CI run #3191

Squashed commit created from 9d61519~18ce4659

Signed-off-by: Divam <[email protected]>
@meiersi-da meiersi-da force-pushed the meiersi/dn/feature-cip-73 branch from 0f126e6 to 4864f05 Compare November 17, 2025 06:57
Signed-off-by: Simon Meier <[email protected]>
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.

3 participants