Add uv.lock conflict resolution instructions (#64848)

Author: potiuk

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
 

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