SiriusTL666 commented on PR #12974: URL: https://github.com/apache/seatunnel/pull/12974#issuecomment-6555717545
Rebased onto the latest `dev` and resolved the conflict. The two `incompatible-changes.md` files conflicted because upstream added the Doris `TIMESTAMP_TZ` section at the same place this PR adds the Socket `connect_timeout_ms` section. Both sections are kept: upstream's first, this PR's immediately after, in both the English and Chinese pages. No other file conflicted and no source change was needed. State now: `mergeable = MERGEABLE`, 0 commits behind `dev`. Branch head `e9e080937`. CI has not started on this branch yet. Would a maintainer mind approving the workflow run so the checks can report on this commit? -- 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]
