Skip to content

this change will pass at first but will result in silent merge#9

Merged
m3dwards merged 2 commits into
masterfrom
250910-silent-merge-test-pr3
Jun 17, 2026
Merged

this change will pass at first but will result in silent merge#9
m3dwards merged 2 commits into
masterfrom
250910-silent-merge-test-pr3

Conversation

@m3dwards

Copy link
Copy Markdown
Owner

This PR should be fine as a PR but when it's merged into master it will cause a silent merge conflict with #5

@m3dwards m3dwards force-pushed the master branch 2 times, most recently from df16346 to c107e07 Compare May 28, 2026 17:38
@m3dwards m3dwards force-pushed the 250910-silent-merge-test-pr3 branch from 6686520 to 92820eb Compare May 28, 2026 17:48
@m3dwards m3dwards force-pushed the master branch 3 times, most recently from 393dc8a to 2ce4ae7 Compare June 1, 2026 20:01
@m3dwards m3dwards force-pushed the master branch 2 times, most recently from 393dc8a to f56a62e Compare June 15, 2026 18:21
l0rinc and others added 2 commits June 15, 2026 14:25
`CalculateMaximumSignedInputSize()` is passed the outpoint being sized, but that context was not used when estimating the signed input size.
Pass the outpoint through so externally selected inputs are not underestimated.

Co-authored-by: Antoine Poinsot <[email protected]>
@m3dwards m3dwards force-pushed the 250910-silent-merge-test-pr3 branch from 92820eb to 0d57341 Compare June 15, 2026 18:26
@m3dwards m3dwards force-pushed the master branch 4 times, most recently from b4074d9 to 055f6fb Compare June 17, 2026 19:12
@m3dwards m3dwards merged commit 919818f into master Jun 17, 2026
6 of 53 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.

2 participants