add news

njzjz · web-flow · commit 85a47baeb45c · 2024-07-14T19:39:01.000-04:00
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 @@`
	`1`	+Correct ``—-ignore-conflicts`` (including an em dash) to ``--ignore-conflicts``.