DanielLeens commented on PR #11848:
URL: https://github.com/apache/seatunnel/pull/11848#issuecomment-6730681294

   Hi @zhang-arvin, a quick follow-up because one fact in my last review has 
changed. When I reviewed `4039cedc71` there was no merge conflict; GitHub now 
reports this PR as conflicting with `dev`.
   
   The conflict is not from #11850 (still open). It comes from three newer 
`dev` commits that also append tests to `MySqlTypeConverterTest.java`: #10453 
(SET UNSIGNED), #12742 (UNSIGNED guard) and #13076 (locale-independent type 
names). `MySqlTypeMapperTest.java` has no new `dev` changes, so it should merge 
cleanly. I compared the method names on both sides and there is no overlap with 
your 12 new converter tests, so the resolution should be simply to keep both 
sides' methods and both sides' imports.
   
   Could you sync with the latest `dev`, resolve that conflict, and then run 
the existing fork `Build` on the new head? That also refreshes the CI picture: 
the only failure on the current head was the unrelated `PostgresCDCIT` case in 
`updated-modules-integration-test-part-2`, and the related fix #12454 is 
already on `dev`. After you push, I will re-check the new head. Thanks!


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to