Skip to content

P2741R3 User-generated static_assert messages #6325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2023
Merged

Conversation

jensmaurer
Copy link
Member

@jensmaurer jensmaurer added this to the post-2023-06 milestone Jun 19, 2023
@jensmaurer jensmaurer force-pushed the motions-2023-06-cwg-10 branch from 1aeba98 to 4bc1ecd Compare June 19, 2023 21:20
@jensmaurer
Copy link
Member Author

This still needs conflict resolution with #6279. My idea is to simply rebase this branch onto the branch for the other motion.

@tkoeppe , would that work?

@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 20, 2023

Sure, you can definitely base one PR on another branch. Is it clear how to reconcile the two motions?

@jensmaurer jensmaurer force-pushed the motions-2023-06-cwg-10 branch from 4bc1ecd to 70fd863 Compare June 20, 2023 21:12
@jensmaurer
Copy link
Member Author

Is it clear how to reconcile the two motions?

Yes, there is very little actual overlap.

Rebased and conflicts fixed.

@jensmaurer jensmaurer force-pushed the motions-2023-06-cwg-10 branch from 70fd863 to c89ae6d Compare June 20, 2023 21:14
@jensmaurer jensmaurer force-pushed the motions-2023-06-cwg-10 branch from 16a9504 to c4187f5 Compare June 26, 2023 17:40
@tkoeppe tkoeppe force-pushed the motions-2023-06-cwg-10 branch from c4187f5 to 3d30638 Compare July 16, 2023 21:19
@tkoeppe tkoeppe merged commit 2fb5999 into main Jul 16, 2023
@jensmaurer jensmaurer deleted the motions-2023-06-cwg-10 branch November 12, 2023 21:26
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.

[2023-06 CWG Motion 10] P2741R3 User-generated static_assert messages P2741 R3 user-generated static_assert messages
3 participants