Croway commented on PR #29273:
URL: https://github.com/apache/camel/pull/29273#issuecomment-6685559720

   @davsclaus thanks. I merged `main` into the branch instead of rebasing, so 
the commits you approved stay as they are, and the squash merge drops the merge 
commit anyway.
   
   The only conflict was in `sftp-component.adoc` (and its catalog copy): both 
PRs added a section at the end. The page now has the "Read locks" section from 
#29286, then "Checking whether a file exists". The diff against `main` is 
unchanged: the same 6 files.
   
   The camel-ftp unit tests (190) and the sftp ITs `SftpExistsFileIT`, 
`SftpChangedReadLockIT` and `SftpSimpleProduce*IT` (35) pass on the merged 
branch.
   
   _Claude Code on behalf of Federico Mariani_
   


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