From 043c1ef217c149aafb93774ab96e30ea69ad0bad Mon Sep 17 00:00:00 2001
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
Date: Fri, 14 Jul 2023 08:46:11 -0700
Subject: [PATCH] Prettier: always ignore conflicting/orphaned (#14211)

---
 .prettierignore | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index 3700c8ba5091b1..051fc47ceeab8a 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,19 +1,25 @@
+# This .prettierignore file uses .gitignore syntax
+# see https://prettier.io/docs/en/ignore.html#ignoring-files-prettierignore
+
+# Generated content
 build/
 /files/**/_wikihistory.json
 /files/**/_githistory.json
 
+# Conflicting/orphaned files
+/files/**/conflicting/**/*.md
+/files/**/orphaned/**/*.md
+
 # A full pass on all Markdown files is being performed.
 # The following folders still need a full pass:
 
 # es
 /docs/es/**/*.md
-/files/es/conflicting/**/*.md
 /files/es/games/**/*.md
 /files/es/glossary/**/*.md
 /files/es/learn/**/*.md
 /files/es/mdn/**/*.md
 /files/es/mozilla/**/*.md
-/files/es/orphaned/**/*.md
 /files/es/web/**/*.md
 /files/es/webassembly/**/*.md
 
@@ -27,49 +33,41 @@ build/
 /files/fr/webassembly/**/*.md
 
 # ja
-/files/ja/conflicting/**/*.md
 /files/ja/games/**/*.md
 /files/ja/glossary/**/*.md
 /files/ja/learn/**/*.md
 /files/ja/mdn/**/*.md
 /files/ja/mozilla/**/*.md
-/files/ja/orphaned/**/*.md
 /files/ja/related/**/*.md
 /files/ja/web/**/*.md
 /files/ja/webassembly/**/*.md
 
 # ko
 /docs/ko/**/*.md
-/files/ko/conflicting/**/*.md
 /files/ko/games/**/*.md
 /files/ko/glossary/**/*.md
 /files/ko/learn/**/*.md
 /files/ko/mdn/**/*.md
 /files/ko/mozilla/**/*.md
-/files/ko/orphaned/**/*.md
 /files/ko/web/**/*.md
 /files/ko/webassembly/**/*.md
 
 # pt-br
-/files/pt-br/conflicting/**/*.md
 /files/pt-br/games/**/*.md
 /files/pt-br/glossary/**/*.md
 /files/pt-br/learn/**/*.md
 /files/pt-br/mdn/**/*.md
 /files/pt-br/mozilla/**/*.md
-/files/pt-br/orphaned/**/*.md
 /files/pt-br/web/**/*.md
 /files/pt-br/webassembly/**/*.md
 
 # ru
 /docs/ru/**/*.md
-/files/ru/conflicting/**/*.md
 /files/ru/games/**/*.md
 /files/ru/glossary/**/*.md
 /files/ru/learn/**/*.md
 /files/ru/mdn/**/*.md
 /files/ru/mozilla/**/*.md
-/files/ru/orphaned/**/*.md
 /files/ru/web/**/*.md
 /files/ru/webassembly/**/*.md