Skip to content

Commit

Permalink
add versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
sophietheking committed Aug 9, 2022
1 parent 4834865 commit f39de1b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
7 changes: 7 additions & 0 deletions data/features/syncing-fork-web-ui.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Issue 7629
# Improved UI for manually syncing a fork
versions:
fpt: '*'
ghec: '*'
ghes: '>=3.7'
ghae: 'issue-7629'

0 comments on commit f39de1b

Please sign in to comment.