Merge pull request #12851 from njzjz/patch-1

pypa · Jul 15, 2024 · e99327f · e99327f
2 parents db062e8 + 85a47ba
commit e99327f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md b/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md
@@ -48,7 +48,7 @@ In total, we received 415 responses to the survey.
 
 An overwhelming majority (>70%) of respondents indicated that they want some kind of override that allows them to install packages when there are dependency conflicts. Despite desiring this feature, most respondents said if it exists they would use it "not often" — this indicates that it is an advanced feature that is not critical to day-to-day usage. Nevertheless, because it would be difficult or very difficult to find a workaround (>60%), we suggest that pip should offer a override feature (see recommendations, below).
 
-Over half of the respondents said that `pip install tea coffee --ignore-conflicts` was the most ideal syntax for this command when installing multiple packages at once with a conflicting dependency. When using the `pip install —-ignore-conflicts` command, a majority (>48%) of respondents said they would prefer pip to install to the most recent version of the conflicted dependency.
+Over half of the respondents said that `pip install tea coffee --ignore-conflicts` was the most ideal syntax for this command when installing multiple packages at once with a conflicting dependency. When using the `pip install --ignore-conflicts` command, a majority (>48%) of respondents said they would prefer pip to install to the most recent version of the conflicted dependency.
 
 Most respondents suggested that installing the latest version by default is safer, because it could include security fixes or features that would be difficult to replicate on their own. They also trust that dependencies will be largely backwards-compatible. However, they said it was very important that it is necessary to have a way to override this default behavior, in case they need to use an older version of the conflicted package.
 

diff --git a/news/12851.doc.rst b/news/12851.doc.rst
@@ -0,0 +1 @@
+Correct ``—-ignore-conflicts`` (including an em dash) to ``--ignore-conflicts``.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Correct ``—-ignore-conflicts`` (including an em dash) to ``--ignore-conflicts``.