This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new d9baf3e96b1 Add uv.lock conflict resolution instructions (#64848)
d9baf3e96b1 is described below
commit d9baf3e96b1bc41cc277b49a466dd7050c683904
Author: Jarek Potiuk <[email protected]>
AuthorDate: Tue Apr 7 20:54:48 2026 +0300
Add uv.lock conflict resolution instructions (#64848)
---
AGENTS.md | 4 ++++
contributing-docs/10_working_with_git.rst | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/AGENTS.md b/AGENTS.md
index 3abe9eda14c..33d1486cbc2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -63,6 +63,10 @@ UV workspace monorepo. Key paths:
- `ci/prek/` — prek (pre-commit) hook scripts; shared utilities in
`common_prek_utils.py`
- `tests/` — pytest tests for the scripts; run with `uv run --project
scripts pytest scripts/tests/`
+The `uv.lock` file is generated by `uv lock`, `uv sync` and is committed to
the repo - it contains snapshot of
+versions of all dependencies used for development of Airflow. If at any point
in time you have a conflict
+with `uv.lock`, simply delete it and run `uv lock` to regenerate it.
+
## Architecture Boundaries
diff --git a/contributing-docs/10_working_with_git.rst
b/contributing-docs/10_working_with_git.rst
index 5551b1ea513..32536bfde3f 100644
--- a/contributing-docs/10_working_with_git.rst
+++ b/contributing-docs/10_working_with_git.rst
@@ -181,7 +181,10 @@ we will be adding the remote as "apache" so you can refer
to it easily
push your changes to your repository. That should trigger the build in our
CI if you have a
Pull Request (PR) opened already
-8. While rebasing you might have conflicts. Read carefully what git tells you
when it prints information
+8. When you have conflicts with ``uv.lock`` when rebasing, simply delete the
``uv.lock`` file and run
+ ``uv lock`` to regenerate it. This is the recommended way to solve
conflicts in ``uv.lock`` file.
+
+9. While rebasing you might have conflicts. Read carefully what git tells you
when it prints information
about the conflicts. You need to solve the conflicts manually. This is
sometimes the most difficult
part and requires deliberately correcting your code and looking at what has
changed since you developed your
changes
@@ -195,7 +198,7 @@ we will be adding the remote as "apache" so you can refer
to it easily
you have a very intuitive and helpful merge tool. For more information, see
`Resolve conflicts
<https://www.jetbrains.com/help/idea/resolving-conflicts.html>`_.
-9. After you've solved your conflict run
+10. After you've solved your conflict run
``git rebase --continue``
