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.

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

Fix encoding of chains of groups of exceptions #289

Merged
merged 9 commits into from
Jul 22, 2022
Merged

Conversation

denismerigoux
Copy link
Contributor

Needed by #287, finishes to implement #170.

@denismerigoux denismerigoux added ❌ bug Something isn't working 🔧 compiler Issue concerns the compiler labels Jul 12, 2022
@denismerigoux denismerigoux added this to the Catala v1.0 milestone Jul 12, 2022
@denismerigoux denismerigoux marked this pull request as ready for review July 13, 2022 13:36
@denismerigoux denismerigoux requested a review from AltGr July 13, 2022 13:36
@AltGr
Copy link
Contributor

AltGr commented Jul 13, 2022

This looks good ! If it doesn't take too long I'd prefer to wait for #272 to be merged first (then I can take care of rebasing this) ; it'll probably be easier than handling the conflicts the other way around.

@denismerigoux
Copy link
Contributor Author

Ok let's wait for #272 to be merged. I tested the rebasing on #287 and it correctly solves my problem :)

@denismerigoux
Copy link
Contributor Author

Can I kindly ask you @AltGr to do the pre-merge or rebase with master ?

@denismerigoux denismerigoux mentioned this pull request Jul 20, 2022
9 tasks
@AltGr
Copy link
Contributor

AltGr commented Jul 22, 2022

Rebased!

@denismerigoux denismerigoux merged commit 1013fad into master Jul 22, 2022
@denismerigoux denismerigoux deleted the fix_171 branch September 6, 2022 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
❌ bug Something isn't working 🔧 compiler Issue concerns the compiler
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants