potiuk commented on PR #64754: URL: https://github.com/apache/airflow/pull/64754#issuecomment-4312007287
HEllo @baraka-akeyless -> I see you keep on having conflicts with uv.lock - and while it's expected to see it in a pr that changes dependencies, you can avoid a lot of problems by `rebasicng` and merging your PR. When you are choosing `merge` -> what happens is that your PR contains not only your changes, but also changes in main that were done since you started the branch. This is different when you do rebase - because when you rebase - you "move" whatever your PR did on top of `main` - which means that in your PR you have **only** changes from your PR. Could you please rebase your PR once again (it might be that due to merge commits you already have you will have to solve commits few times during the rebase - but then next rebase should be way simpler. -- 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]
