Skip to content
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.

Sign up for GitHub

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

Jump to bottom

P2741R3 User-generated static_assert messages #6325

Merged
merged 1 commit into from Jul 16, 2023
Merged

P2741R3 User-generated static_assert messages #6325

merged 1 commit into from Jul 16, 2023

Conversation

jensmaurer
Copy link
Member

@jensmaurer jensmaurer added this to the post-2023-06 milestone Jun 19, 2023
@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
Copy link
Member Author

Is it clear how to reconcile the two motions?

Yes, there is very little actual overlap.

Rebased and conflicts fixed.

JohelEGP
JohelEGP suggested changes Jun 26, 2023
View reviewed changes
source/declarations.tex Outdated Show resolved Hide resolved
source/declarations.tex Outdated Show resolved Hide resolved
source/declarations.tex Outdated Show resolved Hide resolved
@tkoeppe tkoeppe merged commit 2fb5999 into main Jul 16, 2023
4 checks passed
@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
Reviewers

@JohelEGP JohelEGP JohelEGP approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
post-2023-06
3 participants
@jensmaurer @tkoeppe @JohelEGP