From def72a64e0c43ed407ee09d619b3e12ef24b95c5 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Wed, 11 Dec 2024 12:45:56 -0800
Subject: [PATCH] copy

---
 aider/website/_includes/venv-pipx.md | 10 ++++++----
 aider/website/docs/install.md        |  2 +-
 aider/website/docs/install/pipx.md   | 17 +----------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/aider/website/_includes/venv-pipx.md b/aider/website/_includes/venv-pipx.md
index 3b2d0fc00..a1fa2fd5e 100644
--- a/aider/website/_includes/venv-pipx.md
+++ b/aider/website/_includes/venv-pipx.md
@@ -1,7 +1,9 @@
 {: .tip }
-Using a Python 
+The best way to install aider is with
+[pipx](/docs/install/pipx.html)
+or
+[uv](/docs/install/uv.html)
+once for your whole system.
+Or, using a python
 [virtual environment](https://docs.python.org/3/library/venv.html){:target="_blank"}
 is recommended.
-Or, you could
-[use pipx to install aider](/docs/install/pipx.html)
-once for your whole system.
diff --git a/aider/website/docs/install.md b/aider/website/docs/install.md
index df5358c89..abb509a33 100644
--- a/aider/website/docs/install.md
+++ b/aider/website/docs/install.md
@@ -15,7 +15,7 @@ for more details,
 or the
 [usage instructions](https://aider.chat/docs/usage.html) to start coding with aider.
 
-{% include python-m-aider.md %}
+{% include venv-pipx.md %}
 
 <div class="video-container">
   <video controls poster="/assets/install.jpg">
diff --git a/aider/website/docs/install/pipx.md b/aider/website/docs/install/pipx.md
index 513e46b08..8c5940141 100644
--- a/aider/website/docs/install/pipx.md
+++ b/aider/website/docs/install/pipx.md
@@ -18,19 +18,4 @@ pipx install aider-chat
 {% include replit-pipx.md %}
 
 
-## Avoids package conflicts
-If you are using aider to work on a python project, sometimes your project will require
-specific versions of python packages which conflict with the versions that aider
-requires.
-If this happens, the `python -m pip install` command may return errors like these:
-
-```
-aider-chat 0.23.0 requires somepackage==X.Y.Z, but you have somepackage U.W.V which is incompatible.
-```
-
-You can avoid this problem by installing aider using `pipx`,
-which will install it globally on your system
-within its own python environment.
-This way you can use aider to work on any python project,
-even if that project has conflicting dependencies.
-
+{% include conflicts.md %}