frodo2000 commented on PR #74617: URL: https://github.com/apache/airflow/pull/74617#issuecomment-6163498904
> `uv.lock` on `main` just moved via commit [`68a4c31`](https://redirect.github.com/apache/airflow/commit/68a4c3177f94738508aade194256753ed5157e87) and this PR currently conflicts. > > Quickest fix: > > ```shell > git fetch upstream main && git rebase upstream/main > rm uv.lock && uv lock > git add uv.lock && git rebase --continue > git push --force-with-lease > ``` > > _Automated nudge — ignore if you're not ready to rebase. This comment is updated in place on future `uv.lock` bumps._ uv.lock removed from my 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]
