Merge branch 'main' into jules-4795

2025-12-25 11:03:37 -05:00 · 2021-10-18 15:11:48 +02:00
parent 0e8ab632ec 1f71206858
commit 13edfd8788
4509 changed files with 10139 additions and 113043 deletions
--- a/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/index.md
+++ b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/index.md
@@ -9,6 +9,7 @@ versions:
  fpt: '*'
  ghes: '*'
  ghae: '*'
+  ghec: '*'
 topics:
  - Pull requests
 children: