Skip to content

Conversation

@JooHyukKim
Copy link
Member

@JooHyukKim JooHyukKim commented Jan 15, 2025

part of #700
blocked by #704

@cowtowncoder
Copy link
Member

cowtowncoder commented Jan 15, 2025

Ok this did not merge cleanly from part 1. Lots of merge conflict work now.

Going forward maybe we should avoid/reduce changes to import clean up; it's tons of work with limited return on investment.

Especially since I need to clean merge conflicts first wrt 2.19 in which I merged part 1 but ALSO to master, second time around. It's tons of work.

@cowtowncoder cowtowncoder merged commit 5bb7171 into FasterXML:2.19 Jan 15, 2025
4 checks passed
@JooHyukKim
Copy link
Member Author

Going forward maybe we should avoid/reduce changes to import clean up; it's tons of work with limited return on investment.

Sorry about that 🥲. Yeah merging into master and stuff should be lots of work. Will do!

@cowtowncoder
Copy link
Member

Phew! Now merged to master...

@JooHyukKim
Copy link
Member Author

Thank you so much @cowtowncoder!!! 🥲

@JooHyukKim JooHyukKim deleted the JooHyukKim-joohyukkim/2.19/547-jstep10-migrate-to-junit5-part-2 branch January 18, 2025 01:54
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