You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
in dcl.pre/p10, there is a minor conflict between P2361 and the current draft.
However, P2741R3 also on the ballot, assumes P2361 is going to get approved,
so i would recommend
Merging P2741R3 before P2361
When applying P2361, do not apply the changes in dcl.pre/p10 and dcl.pre/p1, as P2741R3 contains these changes already.
Hm, merging motions out of order is a bit unusual. @jensmaurer Let me know if you need any advice on this, otherwise I'll leave you to figure something out (but do say in the commit message how this is being reconciled).
@cor3ntin Could you please point out the prior change that causes the merge conflict between your paper and the current draft? (I'd like to mention that in the reconciliation message, too.)
https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2023/p2361r6.pdf
The text was updated successfully, but these errors were encountered: