DanielLeens commented on PR #10583: URL: https://github.com/apache/seatunnel/pull/10583#issuecomment-5307000977
Hi @LiJie20190102, thanks for adding this Javadoc — it's a good addition to a class that's easy to misread without it. GitHub is currently reporting a real merge conflict against `dev` (`mergeable: CONFLICTING`, `mergeStateStatus: DIRTY`), not just a stale-branch warning. The likely cause: `MultiTableWriterRunnable.java` is the only file this PR touches, and that class has had several substantial changes land on `dev` since this PR was opened (row-error-handling plumbing, classloader-release fixes, and related test infrastructure), so your comment additions are landing on lines that have since moved or changed shape. Could you sync with the latest `dev` and resolve the conflict on your side? The usual steps: ```bash git fetch upstream git rebase upstream/dev # resolve conflicts in MultiTableWriterRunnable.java, keeping your Javadoc # attached to the right methods/fields on the current code git push origin doc_multi_table_writer_runnable --force-with-lease ``` Once that's done and CI is green again, happy to take another look. -- 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]
