From f39de1bc98b5a17fe88e5b9b86f13a132cb1d778 Mon Sep 17 00:00:00 2001
From: Sophie <29382425+sophietheking@users.noreply.github.com>
Date: Tue, 9 Aug 2022 14:01:08 +0200
Subject: [PATCH] add versioning

---
 .../working-with-forks/syncing-a-fork.md       | 18 +++++++++++-------
 data/features/syncing-fork-web-ui.yml          |  7 +++++++
 2 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 data/features/syncing-fork-web-ui.yml

diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md
index c8daef18057d..60c825bd8c51 100644
--- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md
+++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md
@@ -23,15 +23,19 @@ permissions: People with write access for a forked repository can sync the fork
 
 ## Syncing a fork branch from the web UI
 
-1. On {% data variables.product.product_name %}, navigate to the main page of the forked repository that you want to sync with the upstream repository.
-2. Select the **Sync fork** dropdown.
-    !["Sync fork" dropdown emphasized](/assets/images/help/repository/sync-fork-dropdown.png)
-3. Review the details about the commits from the upstream repository, then click **Update branch**.
-    ![Sync fork modal with "Update branch" button emphasized](/assets/images/help/repository/update-branch-button.png)
+1. On {% data variables.product.product_name %}, navigate to the main page of the forked repository that you want to sync with the upstream repository.{% ifversion syncing-fork-web-ui %}
+3. Select the **Sync fork** dropdown.
+    !["Sync fork" dropdown emphasized](/assets/images/help/repository/sync-fork-dropdown.png){% else %}
+2. Select the **Fetch upstream** drop-down.
+    !["Fetch upstream" drop-down](/assets/images/help/repository/fetch-upstream-drop-down.png){% endif %}{% ifversion syncing-fork-web-ui %}
+4. Review the details about the commits from the upstream repository, then click **Update branch**.
+    ![Sync fork modal with "Update branch" button emphasized](/assets/images/help/repository/update-branch-button.png){% else %}
+3. Review the details about the commits from the upstream repository, then click **Fetch and merge**.
+    !["Fetch and merge" button](/assets/images/help/repository/fetch-and-merge-button.png){% endif %}
 
 If the changes from the upstream repository cause conflicts, {% data variables.product.company_short %} will prompt you to create a pull request to resolve the conflicts.
-
-![Fork sync conflict modal](/assets/images/help/repository/fork-sync-conflict.png)
+{% ifversion syncing-fork-web-ui %}
+![Fork sync conflict modal](/assets/images/help/repository/fork-sync-conflict.png){% endif %}
 
 ## Syncing a fork branch with the {% data variables.product.prodname_cli %}
 
diff --git a/data/features/syncing-fork-web-ui.yml b/data/features/syncing-fork-web-ui.yml
new file mode 100644
index 000000000000..05f39707dec0
--- /dev/null
+++ b/data/features/syncing-fork-web-ui.yml
@@ -0,0 +1,7 @@
+# Issue 7629
+# Improved UI for manually syncing a fork
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.7'
+  ghae: 'issue-7629'