Merge main into canton-3.4 #2754
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com> Signed-off-by: Robert Autenrieth <31539813+rautenrieth-da@users.noreply.github.com> Co-authored-by: Itai Segall <itai.segall@digitalasset.com>
nicu-da
approved these changes
Oct 20, 2025
moritzkiefer-da
approved these changes
Oct 20, 2025
martinflorian-da
force-pushed
the
martinflorian-da/cni-2301-final-merge
branch
from
e051ec7 to
847c8ee
Compare
Ah sadly if I'm doing "merge commit" this also means that we need to do a full @moritzkiefer-da if you have a better idea don't let me slow you down; probably we could also just remove the branche protection for canton-3.4 briefly |
not sure what you're trying to achieve here? |
Get a commit on there that contains |
|
I wouldn't overoptimize for that, just keep the |
martinflorian-da
force-pushed
the
martinflorian-da/cni-2301-final-merge
branch
from
847c8ee to
a9e489d
Compare
…2301-final-merge [force] [force] Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
martinflorian-da
force-pushed
the
martinflorian-da/cni-2301-final-merge
branch
from
a9e489d to
02629e7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mainly I want the last commmit there to contain
[ci]...