SEZ9 commented on PR #13170:
URL: https://github.com/apache/seatunnel/pull/13170#issuecomment-6992030519

   Hi @sharpca, thanks for the patience on this one, and for confirming the 
reviewed head.
   
   The merge gate has changed since your last comment. On the unchanged head 
`7235d6a326fbbcfac8e8fc07187fe34210b3ddbe`, GitHub now reports actual content 
conflicts with current `dev` (diverged, ahead 4 / behind 44). The earlier "no 
conflict, no sync needed" guidance no longer applies, and the branch can't be 
merged as it stands.
   
   The existing source review found no blockers, and that assessment still 
holds. The successful Build run 42802276450 only covers the old head, so it 
won't carry over to the resolved one.
   
   Remaining asks:
   
   1. Please resolve the conflicts against current `dev` and push the result.
   2. Please link the checks for the new head once they have run.
   3. Please confirm whether the diff is still the same 9 files with the same 
patches as before. If resolving the conflicts changed any of the PR's own 
changes, point out where, so that part can be re-checked rather than the whole 
PR.
   
   The `connector-file-local-it` timeout follow-up stays separate in #13219, so 
nothing for it is needed here.
   
   Once the resolved head is up and its checks are linked, the remaining step 
is the maintainer approval and merge.
   
   <!-- streview-comment:2433 -->


-- 
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