diff --git a/assets/images/help/desktop/choose-repository-location-url-tab-windows.png b/assets/images/help/desktop/choose-repository-location-url-tab-windows.png new file mode 100644 index 000000000000..4ff070e04e5b Binary files /dev/null and b/assets/images/help/desktop/choose-repository-location-url-tab-windows.png differ diff --git a/assets/images/help/desktop/clone-a-repository-url-tab-name-input.png b/assets/images/help/desktop/clone-a-repository-url-tab-name-input.png new file mode 100644 index 000000000000..fde76f0871ce Binary files /dev/null and b/assets/images/help/desktop/clone-a-repository-url-tab-name-input.png differ diff --git a/assets/images/help/desktop/clone-choose-button-url-windows.png b/assets/images/help/desktop/clone-choose-button-url-windows.png new file mode 100644 index 000000000000..ed56604e7c7f Binary files /dev/null and b/assets/images/help/desktop/clone-choose-button-url-windows.png differ diff --git a/assets/images/help/desktop/create-fork-button-windows.png b/assets/images/help/desktop/create-fork-button-windows.png new file mode 100644 index 000000000000..4e08a50128ed Binary files /dev/null and b/assets/images/help/desktop/create-fork-button-windows.png differ diff --git a/content/desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop.md b/content/desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop.md index 1b9f462aaf0b..314f8a1ac075 100644 --- a/content/desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop.md +++ b/content/desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop.md @@ -18,7 +18,7 @@ You can create a local copy of any repository on {% data variables.product.githu When you clone a repository, any changes you push to {% data variables.product.github %} will affect the original repository. To make changes without affecting the original project, you can create a separate copy by forking the repository. You can create a pull request to propose that maintainers incorporate the changes in your fork into the original upstream repository. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks). -When you try to use {% data variables.product.prodname_desktop %} to clone a repository that you do not have write access to, {% data variables.product.prodname_desktop %} will prompt you to create a fork automatically. You can choose to use your fork to contribute to the original upstream repository or to work independently on your own project. Any existing forks default to contributing changes to their upstream repositories. You can modify this choice at any time. For more information, see [Managing fork behavior](#managing-fork-behavior). +When you use {% data variables.product.prodname_desktop %} to push new commits to a repository that you do not have write access to, {% data variables.product.prodname_desktop %} will prompt you to create a fork. You can choose to use your fork to contribute to the original upstream repository or to work independently on your own project. Any existing forks default to contributing changes to their upstream repositories. You can modify this choice at any time. For more information, see [Managing fork behavior](#managing-fork-behavior). You can also clone a repository directly from {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}. For more information, see [AUTOTITLE](/desktop/adding-and-cloning-repositories/cloning-a-repository-from-github-to-github-desktop). diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo.md index b09607f58b84..c41b275dcbb6 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo.md @@ -126,6 +126,10 @@ Right now, you have a fork of the Spoon-Knife repository, but you do not have th {% cli %} +## Cloning your forked repository + +Right now, you have a fork of the Spoon-Knife repository, but you do not have the files in that repository locally on your computer. + {% data reusables.cli.cli-learn-more %} To create a clone of your fork, use the `--clone` flag. @@ -136,16 +140,6 @@ gh repo fork REPOSITORY --clone=true {% endcli %} -{% desktop %} - -{% data reusables.desktop.choose-clone-repository %} -{% data reusables.desktop.cloning-location-tab %} -{% data reusables.desktop.cloning-repository-list %} -{% data reusables.desktop.choose-local-path %} -{% data reusables.desktop.click-clone %} - -{% enddesktop %} - ## Configuring Git to sync your fork with the upstream repository When you fork a project in order to propose changes to the upstream repository, you can configure Git to pull changes from the upstream repository into the local clone of your fork. diff --git a/data/reusables/desktop/choose-local-path-url-tab.md b/data/reusables/desktop/choose-local-path-url-tab.md new file mode 100644 index 000000000000..185237d1d226 --- /dev/null +++ b/data/reusables/desktop/choose-local-path-url-tab.md @@ -0,0 +1,3 @@ +1. To select the local directory into which you want to clone the repository, next to the "Local Path" field, click **Choose...** and navigate to the directory. + + ![Screenshot of the "URL" tab of the "Clone a repository" window. A button, labeled "Choose", is highlighted with an orange outline.](/assets/images/help/desktop/clone-choose-button-url-windows.png) diff --git a/data/reusables/desktop/cloning-location-url-tab.md b/data/reusables/desktop/cloning-location-url-tab.md new file mode 100644 index 000000000000..09ab1e40c353 --- /dev/null +++ b/data/reusables/desktop/cloning-location-url-tab.md @@ -0,0 +1,3 @@ +1. Click the tab that corresponds to the location of the repository you want to clone. In this example, we click on the URL tab. + + ![Screenshot of the "Clone a repository" window. At the top of the window, "GitHub.com", "GitHub Enterprise" and "URL" tabs are outlined in orange. The "URL" tab is selected.](/assets/images/help/desktop/choose-repository-location-url-tab-windows.png) diff --git a/data/reusables/desktop/cloning-repository-url.md b/data/reusables/desktop/cloning-repository-url.md new file mode 100644 index 000000000000..38aac616417c --- /dev/null +++ b/data/reusables/desktop/cloning-repository-url.md @@ -0,0 +1,3 @@ +1. Enter the url or path of the repository you want to clone. + + ![Screenshot of the "URL" tab of the "Clone a repository" window. The input containing "octocat/Spoon-Knife" is highlighted with an orange outline.](/assets/images/help/desktop/clone-a-repository-url-tab-name-input.png) diff --git a/data/reusables/desktop/create-fork-prompt.md b/data/reusables/desktop/create-fork-prompt.md new file mode 100644 index 000000000000..dfb7434937f4 --- /dev/null +++ b/data/reusables/desktop/create-fork-prompt.md @@ -0,0 +1,3 @@ +1. To create a fork, attempt to write a change to the repository. For example, create a new branch and publish it. A prompt will appear asking if you want to fork this repository. Click "Fork this repository" + + ![Screenshot of the "Create a fork prompt" window. A button, labeled "Fork this repository", is highlighted with an orange outline.](/assets/images/help/desktop/create-fork-button-windows.png) diff --git a/data/reusables/desktop/forking-a-repo.md b/data/reusables/desktop/forking-a-repo.md index f4f97719b868..48308b58f8f1 100644 --- a/data/reusables/desktop/forking-a-repo.md +++ b/data/reusables/desktop/forking-a-repo.md @@ -1,8 +1,9 @@ -In {% data variables.product.prodname_desktop %}, if you attempt to clone a repository that you don't have write access to, a fork is automatically created for you. +In {% data variables.product.prodname_desktop %}, if you clone a repository that you don't have write access to, and then attempt to push new commits to the repository, a fork will be created for you. {% data reusables.desktop.choose-clone-repository %} -{% data reusables.desktop.cloning-location-tab %} -{% data reusables.desktop.cloning-repository-list %} -{% data reusables.desktop.choose-local-path %} +{% data reusables.desktop.cloning-location-url-tab %} +{% data reusables.desktop.cloning-repository-url %} +{% data reusables.desktop.choose-local-path-url-tab %} {% data reusables.desktop.click-clone %} +{% data reusables.desktop.create-fork-prompt %} {% data reusables.desktop.fork-type-prompt %}