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

Add RegexMatchTimeoutExceptionDestructurer for RegexMatchTimeoutException #456

Closed
wants to merge 2 commits into from

Conversation

Driedas
Copy link
Contributor

@Driedas Driedas commented Feb 4, 2022

As per #418, adding a custom destructurer for RegexMatchTimeoutException.
Behold the glory that is my contribution!
/sarcasm ;-)

@RehanSaeed
Copy link
Owner

Looks good. You've got conflicts for some reason though.

@Driedas
Copy link
Contributor Author

Driedas commented Feb 7, 2022

Yeah, I saw that, but am not really sure why, the only change I made in the conflicting file is adding the destructurer into the default set:
image

@Driedas
Copy link
Contributor Author

Driedas commented Feb 7, 2022

Ok, got it (thanks to a "friend on the phone"), looks like my git client opened the master branch by default whereas you stopped using master in November 2020 and are using "main" instead. My commit thus ended up in the master branch. Have resolved the conflict via the github merge tool but there is now an ugly merge commit in the log. Can you squash these two while merging the PR or do we start from scratch and I'll submit the PR from the main branch instead?

@RehanSaeed
Copy link
Owner

I ran the pipeline again (GitHub recently required that for new contributors) and there still seems to be a conflict.

@Driedas
Copy link
Contributor Author

Driedas commented Feb 9, 2022

ok, I'll drop the whole thing and do it from scratch on the main branch instead of master...

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