Merge branch 'main' into patch-1

content/actions/guides/building-and-testing-python.md

@@ -397,17 +397,22 @@ jobs:
 
 ## Publishing to package registries
 
-You can configure your workflow to publish your Python package to any package registry you'd like when your CI tests pass.
+You can configure your workflow to publish your Python package to a package registry once your CI tests pass. This section demonstrates how you can use {% data variables.product.prodname_actions %} to upload your package to PyPI each time you [publish a release](/github/administering-a-repository/managing-releases-in-a-repository). 
 
-You can store any access tokens or credentials needed to publish your package using secrets. The following example creates and publishes a package to PyPI using `twine` and `dist`. For more information, see "[Creating and using encrypted secrets](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)."
+For this example, you will need to create two [PyPI API tokens](https://pypi.org/help/#apitoken). You can use secrets to store the access tokens or credentials needed to publish your package. For more information, see "[Creating and using encrypted secrets](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)."
 
 {% raw %}
 ```yaml{:copy}
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
 name: Upload Python Package
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   deploy:
@@ -421,14 +426,14 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine
-      - name: Build and publish
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: |
-          python setup.py sdist bdist_wheel
-          twine upload dist/*
+          pip install build
+      - name: Build package
+        run: python -m build
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}
 ```
 {% endraw %}
 

content/actions/guides/index.md

@@ -100,7 +100,6 @@ children:
   - /deploying-to-amazon-elastic-container-service
   - /deploying-to-azure-app-service
   - /deploying-to-google-kubernetes-engine
-  - /deploying-to-google-kubernetes-engine
   - /using-github-actions-for-project-management
   - /closing-inactive-issues
   - /scheduling-issue-creation

content/actions/guides/publishing-docker-images.md

@@ -36,8 +36,9 @@ We recommend that you have a basic understanding of workflow configuration optio
 You might also find it helpful to have a basic understanding of the following:
 
 - "[Encrypted secrets](/actions/reference/encrypted-secrets)"
-- "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow)"
-- "[Working with the Docker registry](/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)"
+- "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow)"{% if currentVersion == "free-pro-team@latest" %}
+- "[Working with the {% data variables.product.prodname_container_registry %}](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)"{% else %}
+- "[Working with the Docker registry](/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)"{% endif %}
 
 ## About image configuration
 
@@ -63,9 +64,11 @@ The `build-push-action` options required for Docker Hub are:
 * `tags`: The tag of your new image in the format `DOCKER-HUB-NAMESPACE/DOCKER-HUB-REPOSITORY:VERSION`. You can set a single tag as shown below, or specify multiple tags in a list.
 * `push`: If set to `true`, the image will be pushed to the registry if it is built successfully.
 
-{% raw %}
 ```yaml{:copy}
 name: Publish Docker image
+
+{% data reusables.actions.actions-not-certified-by-github %}
+
 on:
   release:
     types: [published]
@@ -79,35 +82,50 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: {% raw %}${{ secrets.DOCKER_USERNAME }}{% endraw %}
+          password: {% raw %}${{ secrets.DOCKER_PASSWORD }}{% endraw %}
       - name: Push to Docker Hub
         uses: docker/build-push-action@v2
         with:
           push: true
           tags: my-docker-hub-namespace/my-docker-hub-repository:latest
 ```
-{% endraw %}
 
-{% data reusables.github-actions.docker-tag-with-ref %}
+The above workflow checks out the {% data variables.product.prodname_dotcom %} repository, uses the `login-action` to log in to the registry, and then uses the `build-push-action` action to: build a Docker image based on your repository's `Dockerfile`; push the image to Docker Hub, and apply a tag to the image.
 
 ## Publishing images to {% data variables.product.prodname_registry %}
 
 {% data reusables.github-actions.release-trigger-workflow %}
 
-In the example workflow below, we use the Docker `login-action` and `build-push-action` actions to build the Docker image, and if the build succeeds, push the built image to {% data variables.product.prodname_registry %}.
+In the example workflow below, we use the Docker `login-action`{% if currentVersion == "free-pro-team@latest" %}, `metadata-action`,{% endif %} and `build-push-action` actions to build the Docker image, and if the build succeeds, push the built image to {% data variables.product.prodname_registry %}.
 
 The `login-action` options required for {% data variables.product.prodname_registry %} are:
-* `registry`: Must be set to `docker.pkg.github.com`.
+* `registry`: Must be set to {% if currentVersion == "free-pro-team@latest" %}`ghcr.io`{% else %}`docker.pkg.github.com`{% endif %}.
 * `username`: You can use the {% raw %}`${{ github.actor }}`{% endraw %} context to automatically use the username of the user that triggered the workflow run. For more information, see "[Context and expression syntax for GitHub Actions](/actions/reference/context-and-expression-syntax-for-github-actions#github-context)."
 * `password`: You can use the automatically-generated `GITHUB_TOKEN` secret for the password. For more information, see "[Authenticating with the GITHUB_TOKEN](/actions/automating-your-workflow-with-github-actions/authenticating-with-the-github_token)."
 
-The `build-push-action` options required for {% data variables.product.prodname_registry %} are:
-* `tags`: Must be set in the format `docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION`. For example, for an image named `octo-image` stored on {% data variables.product.prodname_dotcom %} at `http://github.com/octo-org/octo-repo`, the `tags` option should be set to `docker.pkg.github.com/octo-org/octo-repo/octo-image:latest`. You can set a single tag as shown below, or specify multiple tags in a list.
-* `push`: If set to `true`, the image will be pushed to the registry if it is built successfully.
+{% if currentVersion == "free-pro-team@latest" %}
+The `metadata-action` option required for {% data variables.product.prodname_registry %} is:
+* `images`: The namespace and name for the Docker image you are building.
+{% endif %}
 
+The `build-push-action` options required for {% data variables.product.prodname_registry %} are:{% if currentVersion == "free-pro-team@latest" %}
+* `context`: Defines the build's context as the set of files located in the specified path.{% endif %}
+* `push`: If set to `true`, the image will be pushed to the registry if it is built successfully.{% if currentVersion == "free-pro-team@latest" %}
+* `tags` and `labels`: These are populated by output from `metadata-action`.{% else %}
+* `tags`: Must be set in the format `docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION`. For example, for an image named `octo-image` stored on {% data variables.product.prodname_dotcom %} at `http://github.com/octo-org/octo-repo`, the `tags` option should be set to `docker.pkg.github.com/octo-org/octo-repo/octo-image:latest`. You can set a single tag as shown below, or specify multiple tags in a list.{% endif %}
+
+{% if currentVersion == "free-pro-team@latest" %}
+{% data reusables.package_registry.publish-docker-image %}
+
+The above workflow if triggered by a push to the "release" branch. It checks out the GitHub repository, and uses the `login-action` to log in to the {% data variables.product.prodname_container_registry %}. It then extracts labels and tags for the Docker image. Finally, it and uses the `build-push-action` action to build the image and publish it on the {% data variables.product.prodname_container_registry %}.
+
+{% else %}
 ```yaml{:copy}
 name: Publish Docker image
+
+{% data reusables.actions.actions-not-certified-by-github %}
+
 on:
   release:
     types: [published]
@@ -133,10 +151,11 @@ jobs:
           push: true
           tags: |
             {% if currentVersion == "github-ae@latest" %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/octo-image:${{ github.sha }}{% endraw %}
-            {% if currentVersion == "github-ae@latest" %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/octo-image:${{ github.ref }}{% endraw %}
+            {% if currentVersion == "github-ae@latest" %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/octo-image:${{ github.event.release.tag_name }}{% endraw %}
 ```
 
-{% data reusables.github-actions.docker-tag-with-ref %}
+The above workflow checks out the {% data variables.product.prodname_dotcom %} repository, uses the `login-action` to log in to the registry, and then uses the `build-push-action` action to: build a Docker image based on your repository's `Dockerfile`; push the image to the Docker registry, and apply the commit SHA and release version as image tags.
+{% endif %}
 
 ## Publishing images to Docker Hub and {% data variables.product.prodname_registry %}
 
@@ -144,8 +163,13 @@ In a single workflow, you can publish your Docker image to multiple registries b
 
 The following example workflow uses the steps from the previous sections ("[Publishing images to Docker Hub](#publishing-images-to-docker-hub)" and "[Publishing images to {% data variables.product.prodname_registry %}](#publishing-images-to-github-packages)") to create a single workflow that pushes to both registries.
 
+
+
 ```yaml{:copy}
 name: Publish Docker image
+
+{% data reusables.actions.actions-not-certified-by-github %}
+
 on:
   release:
     types: [published]
@@ -164,22 +188,33 @@ jobs:
         with:
           username: {% raw %}${{ secrets.DOCKER_USERNAME }}{% endraw %}
           password: {% raw %}${{ secrets.DOCKER_PASSWORD }}{% endraw %}
-      - name: Log in to GitHub Docker Registry
+      - name: Log in to the {% if currentVersion == "free-pro-team@latest" %}Container{% else %}Docker{% endif %} registry
         uses: docker/login-action@v1
         with:
-          registry: {% if currentVersion == "github-ae@latest" %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}
+          registry: {% if currentVersion == "free-pro-team@latest" %}ghcr.io{% elsif currentVersion == "github-ae@latest" %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}
           username: {% raw %}${{ github.actor }}{% endraw %}
           password: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
-      - name: Push to Docker Hub
+      - name: Build and push to Docker Hub
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: my-docker-hub-namespace/my-docker-hub-repository:{% raw %}${{ github.ref }}{% endraw %}
-      - name: Build container image
+          tags: my-docker-hub-namespace/my-docker-hub-repository:{% raw %}${{ github.event.release.tag_name }}{% endraw %}{% if currentVersion == "free-pro-team@latest" %}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ghcr.io/{% raw %}${{ github.repository }}{% endraw %}{% endif %}
+      - name: Build and push to {% data variables.product.prodname_registry %}
         uses: docker/build-push-action@v2
         with:
-          push: true
-          tags: {% if currentVersion == "github-ae@latest" %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/my-image:${{ github.ref }}{% endraw %}
+          push: true{% if currentVersion == "free-pro-team@latest" %}
+          context: .
+          tags: {% raw %}${{ steps.meta.outputs.tags }}{% endraw %}
+          labels: {% raw %}${{ steps.meta.outputs.labels }}{% endraw %}{% else %}
+          tags: {% if currentVersion == "github-ae@latest" %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/my-image:${{ github.event.release.tag_name }}{% endraw %}{% endif %}
 ```
 
-The above workflow checks out the {% data variables.product.prodname_dotcom %} repository, uses the `login-action` twice to log in to both registries, and then uses the `build-push-action` action twice to build and push the Docker image to Docker Hub and {% data variables.product.prodname_registry %}. For both steps, it tags the built Docker image with the Git reference of the workflow event. This workflow is triggered on publishing a {% data variables.product.prodname_dotcom %} release, so the reference for both registries will be the Git tag for the release.
+The above workflow checks out the {% data variables.product.prodname_dotcom %} repository, uses the `login-action` twice to log in to both registries, and then uses the `build-push-action` action twice to build and push the Docker image to Docker Hub and the 
+{% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_container_registry %}. For Docker Hub, it tags the built Docker image with the version tag for the release that triggered the workflow. For the {% data variables.product.prodname_container_registry %}, tags and labels are automatically generated by the `metadata-action` action. 
+{% else %}Docker registry. For both steps, it tags the built Docker image with the version tag for the release that triggered the workflow.
+{% endif %}

content/actions/reference/authentication-in-a-workflow.md

@@ -79,16 +79,16 @@ jobs:
       issues: write {% endif %}
     steps:
       - name: Create issue using REST API
-        run: {% raw %}|
+        run: |
           curl --request POST \
-          --url https://api.github.com/repos/${{ github.repository }}/issues \
-          --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
+          --url {% data variables.product.api_url_code %}/repos/${% raw %}{{ github.repository }}{% endraw %}/issues \
+          --header 'authorization: Bearer ${% raw %}{{ secrets.GITHUB_TOKEN }}{% endraw %}' \
           --header 'content-type: application/json' \
           --data '{
-            "title": "Automated issue for commit: ${{ github.sha }}",
-            "body": "This issue was automatically created by the GitHub Action workflow **${{ github.workflow }}**. \n\n The commit hash was: _${{ github.sha }}_."
+            "title": "Automated issue for commit: ${% raw %}{{ github.sha }}{% endraw %}",
+            "body": "This issue was automatically created by the GitHub Action workflow **${% raw %}{{ github.workflow }}{% endraw %}**. \n\n The commit hash was: _${% raw %}{{ github.sha }}{% endraw %}_."
             }' \
-          --fail{% endraw %}
+          --fail
 ```
 
 ## Permissions for the `GITHUB_TOKEN`

content/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-user-provisioning-for-your-enterprise.md

@@ -84,7 +84,7 @@ You must have administrative access on your IdP to configure the application for
 
   | Value | Other names | Description | Example |
   | :- | :- | :- | :- |
-  | URL | Tenant URL | URL to the SCIM provisioning API for your enterprise on {% data variables.product.prodname_ghe_managed %} | <pre>https&colon;//api.<em>YOUR-GITHUB-AE-HOSTNAME</em>/scim/v2</pre> |
+  | URL | Tenant URL | URL to the SCIM provisioning API for your enterprise on {% data variables.product.prodname_ghe_managed %} | <nobr><code>{% data variables.product.api_url_pre %}</nobr></code> |
   | Shared secret | Personal access token, secret token | Token for application on your IdP to perform provisioning tasks on behalf of an enterprise owner | Personal access token you created in step 1 |
 
 {% endif %}

content/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md

@@ -4,7 +4,6 @@ intro: 'If you purchase additional storage and bandwidth for {% data variables.l
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-git-large-file-storage
   - /articles/about-billing-for-git-large-file-storage
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md

@@ -6,7 +6,6 @@ redirect_from:
   - /articles/downgrading-storage-and-bandwidth-for-a-personal-account/
   - /articles/downgrading-storage-and-bandwidth-for-an-organization/
   - /articles/downgrading-git-large-file-storage
-  - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md

@@ -6,7 +6,6 @@ redirect_from:
   - /articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account/
   - /articles/purchasing-additional-storage-and-bandwidth-for-an-organization/
   - /articles/upgrading-git-large-file-storage
-  - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md

@@ -6,7 +6,6 @@ redirect_from:
   - /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account/
   - /articles/viewing-storage-and-bandwidth-usage-for-an-organization/
   - /articles/viewing-your-git-large-file-storage-usage
-  - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-git-large-file-storage-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md

@@ -4,7 +4,6 @@ intro: 'If you install a paid app in {% data variables.product.prodname_marketpl
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-marketplace
   - /articles/about-billing-for-github-marketplace
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-marketplace
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md

@@ -6,7 +6,6 @@ redirect_from:
   - /articles/canceling-an-app-for-your-personal-account/
   - /articles/canceling-an-app-for-your-organization/
   - /articles/canceling-a-github-marketplace-app
-  - /github/setting-up-and-managing-billing-and-payments-on-github/canceling-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md

@@ -6,7 +6,6 @@ redirect_from:
   - /articles/downgrading-an-app-for-your-personal-account/
   - /articles/downgrading-an-app-for-your-organization/
   - /articles/downgrading-the-billing-plan-for-a-github-marketplace-app
-  - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-the-billing-plan-for-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md

@@ -6,7 +6,6 @@ redirect_from:
   - /articles/upgrading-an-app-for-your-personal-account/
   - /articles/upgrading-an-app-for-your-organization/
   - /articles/upgrading-the-billing-plan-for-a-github-marketplace-app
-  - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-the-billing-plan-for-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md

@@ -20,7 +20,7 @@ topics:
 
 {% note %}
 
-**Billing update for container image storage:** During the beta phase of the {% data variables.product.prodname_container_registry %}, Docker image storage and bandwidth are free for both the previous `docker.pkg.github.com` and current `ghcr.io` hosting services. For more information, see "[Introduction to {% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages)."
+**Billing update for container image storage:** The period of free use for container image storage and bandwidth for the {% data variables.product.prodname_container_registry %} has been extended. If you are using {% data variables.product.prodname_container_registry %} you'll be informed at least one month in advance of billing commencing and you'll be given an estimate of how much you should expect to pay. For more information about the {% data variables.product.prodname_container_registry %}, see "[Working with the Container registry](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)."
 
 {% endnote %}
 

content/billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md

@@ -4,7 +4,6 @@ intro: You will be billed for your sponsorships with the rest of your paid produ
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-sponsors
   - /articles/about-billing-for-github-sponsors
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-sponsors
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/about-billing-for-github-sponsors
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md

@@ -4,7 +4,6 @@ intro: You can downgrade your sponsorship to a lower tier or cancel your sponsor
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship
   - /articles/downgrading-a-sponsorship
-  - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/downgrading-a-sponsorship
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md

@@ -4,7 +4,6 @@ intro: You can upgrade your sponsorship to a higher tier.
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-a-sponsorship
   - /articles/upgrading-a-sponsorship
-  - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-a-sponsorship
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/upgrading-a-sponsorship
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md

@@ -11,7 +11,6 @@ redirect_from:
   - /articles/organization-billing-plans/
   - /articles/github-s-billing-plans
   - /articles/about-billing-for-github-accounts
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-billing-for-github-accounts
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md

@@ -4,7 +4,6 @@ intro: 'With per-user pricing, organizations pay based on team size to access ad
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing
   - /articles/about-per-user-pricing
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-per-user-pricing
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md

@@ -7,7 +7,6 @@ redirect_from:
   - /articles/discounted-organization-accounts/
   - /articles/discounted-billing-plans/
   - /articles/discounted-subscriptions-for-github-accounts
-  - /github/setting-up-and-managing-billing-and-payments-on-github/discounted-subscriptions-for-github-accounts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md

@@ -16,7 +16,6 @@ redirect_from:
   - /articles/downgrading-your-organization-from-github-business-cloud-to-the-team-plan/
   - /articles/downgrading-your-github-billing-plan/
   - /articles/downgrading-your-github-subscription
-  - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/downgrading-your-github-subscription
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md

@@ -4,7 +4,6 @@ intro: 'When you upgrade the subscription for your personal account or organizat
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/how-does-upgrading-or-downgrading-affect-the-billing-process
   - /articles/how-does-upgrading-or-downgrading-affect-the-billing-process
-  - /github/setting-up-and-managing-billing-and-payments-on-github/how-does-upgrading-or-downgrading-affect-the-billing-process
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md

@@ -18,7 +18,6 @@ redirect_from:
   - /articles/adding-seats-to-your-organization/
   - /articles/upgrading-your-github-billing-plan/
   - /articles/upgrading-your-github-subscription
-  - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/upgrading-your-github-subscription
 versions:
   free-pro-team: '*'

content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md

@@ -7,7 +7,6 @@ redirect_from:
   - /articles/viewing-and-managing-pending-changes-to-your-organization-s-billing-plan/
   - /articles/viewing-and-managing-pending-changes-to-your-billing-plan/
   - /articles/viewing-and-managing-pending-changes-to-your-subscription
-  - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-and-managing-pending-changes-to-your-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/about-billing-on-github.md

@@ -4,7 +4,6 @@ intro: 'Everything you purchase on {% data variables.product.prodname_dotcom %}
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github
   - /articles/about-billing-on-github
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/about-billing-on-github
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md

@@ -12,7 +12,6 @@ redirect_from:
   - /articles/how-can-i-add-extra-information-to-my-organization-s-receipts/
   - /articles/adding-information-to-your-organization-s-receipts/
   - /articles/adding-information-to-your-receipts
-  - /github/setting-up-and-managing-billing-and-payments-on-github/adding-information-to-your-receipts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/adding-information-to-your-receipts
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md

@@ -16,7 +16,6 @@ redirect_from:
   - /articles/updating-your-organization-s-payment-method/
   - /articles/switching-payment-methods-for-your-organization/
   - /articles/adding-or-editing-a-payment-method
-  - /github/setting-up-and-managing-billing-and-payments-on-github/adding-or-editing-a-payment-method
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/adding-or-editing-a-payment-method
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md

@@ -7,7 +7,6 @@ redirect_from:
   - /articles/switching-between-monthly-and-yearly-billing-for-your-personal-account/
   - /articles/switching-between-monthly-and-yearly-billing-for-your-organization/
   - /articles/changing-the-duration-of-your-billing-cycle
-  - /github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md

@@ -7,7 +7,6 @@ redirect_from:
   - /articles/redeeming-a-coupon-for-your-personal-account/
   - /articles/redeeming-a-coupon-for-organizations/
   - /articles/redeeming-a-coupon
-  - /github/setting-up-and-managing-billing-and-payments-on-github/redeeming-a-coupon
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/redeeming-a-coupon
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/removing-a-payment-method.md

@@ -8,7 +8,6 @@ redirect_from:
   - /articles/removing-a-credit-card-associated-with-your-organization/
   - /articles/removing-a-payment-method-associated-with-your-organization/
   - /articles/removing-a-payment-method
-  - /github/setting-up-and-managing-billing-and-payments-on-github/removing-a-payment-method
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/removing-a-payment-method
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/setting-your-billing-email.md

@@ -8,7 +8,6 @@ redirect_from:
   - '/articles/how-do-i-change-the-billing-email,setting-your-billing-email/'
   - /articles/setting-your-organization-s-billing-email/
   - /articles/setting-your-billing-email
-  - /github/setting-up-and-managing-billing-and-payments-on-github/setting-your-billing-email
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/setting-your-billing-email
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md

@@ -5,7 +5,6 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/troubleshooting-a-declined-credit-card-charge
   - /articles/what-do-i-do-if-my-card-is-declined/
   - /articles/troubleshooting-a-declined-credit-card-charge
-  - /github/setting-up-and-managing-billing-and-payments-on-github/troubleshooting-a-declined-credit-card-charge
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md

@@ -10,7 +10,6 @@ redirect_from:
   - /articles/unlocking-a-locked-personal-account/
   - /articles/unlocking-a-locked-organization-account/
   - /articles/unlocking-a-locked-account
-  - /github/setting-up-and-managing-billing-and-payments-on-github/unlocking-a-locked-account
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/unlocking-a-locked-account
 versions:
   free-pro-team: '*'

content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md

@@ -7,7 +7,6 @@ redirect_from:
   - /articles/downloading-receipts-for-personal-accounts/
   - /articles/downloading-receipts-for-organizations/
   - /articles/viewing-your-payment-history-and-receipts
-  - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-payment-history-and-receipts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts
 versions:
   free-pro-team: '*'

content/billing/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies.md

@@ -5,7 +5,6 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-organizations-for-procurement-companies
   - /articles/about-organizations-for-resellers/
   - /articles/about-organizations-for-procurement-companies
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-organizations-for-procurement-companies
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies
 versions:
   free-pro-team: '*'

content/billing/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md

@@ -4,7 +4,6 @@ intro: 'You can create and pay for a {% data variables.product.prodname_dotcom %
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client
   - /articles/creating-and-paying-for-an-organization-on-behalf-of-a-client
-  - /github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client
 versions:
   free-pro-team: '*'

content/billing/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization.md

@@ -5,7 +5,6 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/renewing-your-clients-paid-organization
   - /articles/renewing-your-client-s-paid-organization
   - /articles/renewing-your-clients-paid-organization
-  - /github/setting-up-and-managing-billing-and-payments-on-github/renewing-your-clients-paid-organization
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
 versions:
   free-pro-team: '*'

content/billing/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md

@@ -5,7 +5,6 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-or-downgrading-your-clients-paid-organization
   - /articles/upgrading-or-downgrading-your-client-s-paid-organization
   - /articles/upgrading-or-downgrading-your-clients-paid-organization
-  - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-or-downgrading-your-clients-paid-organization
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization
 versions:
   free-pro-team: '*'

content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates.md

@@ -134,7 +134,7 @@ updates:
 
 ### `schedule.interval`
 
-**Required**. You must define how often to check for new versions for each package manager. By default, this is at 5am UTC. To modify this, use [`schedule.time`](#scheduletime) and [`schedule.timezone`](#scheduletimezone).
+**Required**. You must define how often to check for new versions for each package manager. By default, {% data variables.product.prodname_dependabot %} randomly assigns a time to apply all the updates in the configuration file. To set a specific time, you can use [`schedule.time`](#scheduletime) and [`schedule.timezone`](#scheduletimezone).
 
 - `daily`—runs on every weekday, Monday to Friday.
 - `weekly`—runs once each week. By default, this is on Monday. To modify this, use [`schedule.day`](#scheduleday).

content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot.md

@@ -79,3 +79,7 @@ When creating a secret in an organization, you can use a policy to limit which r
    The name of the secret is listed on the Dependabot secrets page. You can click **Update** to change the secret value or its access policy. You can click **Remove** to delete the secret.
 
    ![Update or remove an organization secret](/assets/images/help/dependabot/update-remove-repo-secret.png)
+   
+## Adding {% data variables.product.prodname_dependabot %} to your registries IP allow list
+
+If your private registry is configured with an IP allow list, you can find the IP addresses {% data variables.product.prodname_dependabot %} uses to access the registry in the meta API endpoint, under the `dependabot` key. For more information, see "[Meta](/rest/reference/meta)."

content/codespaces/managing-your-codespaces/managing-access-and-security-for-your-codespaces.md

@@ -9,7 +9,7 @@ topics:
 
 {% data reusables.codespaces.release-stage %}
 
-When you enable access and security for a repository owned by your user account, any codespaces that are created for that repository will have read and write permissions to all other repositories you own. If you want to restrict the repositories a codespace can access, you can limit to it to either the repository the codespace was opened for or specific repositories. You should only enable access and security for repositories you trust. 
+When you enable access and security for a repository owned by your user account, any codespaces that are created for that repository will have read permissions to all other repositories you own. If you want to restrict the repositories a codespace can access, you can limit to it to either the repository the codespace was opened for or specific repositories. You should only enable access and security for repositories you trust. 
 
 {% data reusables.user_settings.access_settings %}
 {% data reusables.user_settings.codespaces-tab %}

content/desktop/contributing-and-collaborating-using-github-desktop/index.md

@@ -9,6 +9,7 @@ versions:
 children:
   - /adding-and-cloning-repositories
   - /making-changes-in-a-branch
+  - /managing-commits
   - /working-with-your-remote-repository-on-github-or-github-enterprise
   - /keeping-your-local-repository-in-sync-with-github
 ---

content/desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch.md

@@ -71,6 +71,19 @@ Some workflows require or benefit from rebasing instead of merging. By rebasing
 
 {% endwindows %}
 
+## Squashing and merging another branch into your project branch
+
+1. Use the **Branch** drop-down and click **Squash and Merge into Current Branch**.
+![Squash and merge in branch dropdown](/assets/images/help/desktop/squash-and-merge-menu.png)
+2. Click the branch you want to merge into the current branch, then click **Squash and merge**.
+![Squash and merge  button](/assets/images/help/desktop/squash-and-merge-selection.png)
+   {% note %}
+
+   **Note:** If there are merge conflicts, {% data variables.product.prodname_desktop %} will warn you above the **Squash and merge** button. You will not be able to squash and merge the branch until you have resolved all conflicts.
+
+   {% endnote %}
+{% data reusables.desktop.push-origin %}
+
 ## Further Reading
 - "[Pull](/github/getting-started-with-github/github-glossary#pull)" in the {% data variables.product.prodname_dotcom %} glossary
 - "[Merge](/github/getting-started-with-github/github-glossary#merge)" in the {% data variables.product.prodname_dotcom %} glossary

content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project.md

@@ -100,14 +100,14 @@ Once you're satisfied with the changes you've chosen to include in your commit,
 
 {% note %}
 
-**Note**: {% data reusables.desktop.tags-push-with-commits %} For more information, see "[Managing tags](/desktop/contributing-to-projects/managing-tags)."
+**Note**: {% data reusables.desktop.tags-push-with-commits %} For more information, see "[Managing tags](/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/managing-tags)."
 
 {% endnote %}
 
 {% data reusables.desktop.commit-message %}
 
   ![Commit message field](/assets/images/help/desktop/commit-message.png)
-2. Optionally, to attribute a commit to another author, click the add co-authors icon and type the username(s) you want to include.
+1. Optionally, to attribute a commit to another author, click the add co-authors icon and type the username(s) you want to include.
 
   ![Add a co-author to the commit message](/assets/images/help/desktop/add-co-author-commit.png)
 {% data reusables.desktop.commit-button %}

content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/index.md

@@ -9,10 +9,7 @@ children:
   - /managing-branches
   - /committing-and-reviewing-changes-to-your-project
   - /stashing-changes
-  - /pushing-changes-to-github
-  - /reverting-a-commit
-  - /cherry-picking-a-commit
-  - /managing-tags
   - /viewing-the-branch-history
+  - /pushing-changes-to-github
 ---
 

content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches.md

@@ -14,6 +14,8 @@ You can use branches to safely experiment with changes to your project. Branches
 
 You always create a branch from an existing branch. Typically, you might create a branch from the default branch of your repository. You can then work on this new branch in isolation from changes that other people are making to the repository.
 
+You can also create a branch starting from a previous commit in a branch's history. This can be helpful if you need to return to an earlier view of the repository to investigate a bug, or to create a hot fix on top of your latest release.
+
 Once you're satisfied with your work, you can create a pull request to merge your changes in the current branch into another branch. For more information, see "[Creating an issue or pull request](/desktop/contributing-to-projects/creating-an-issue-or-pull-request)" and "[About pull requests](/articles/about-pull-requests)."
 
 You can always create a branch in {% data variables.product.prodname_desktop %} if you have read access to a repository, but you can only push the branch to {% data variables.product.prodname_dotcom %} if you have write access to the repository.
@@ -58,6 +60,15 @@ You can always create a branch in {% data variables.product.prodname_desktop %}
 
 {% endwindows %}
 
+## Creating a branch from a previous commit
+
+{% data reusables.desktop.history-tab %}
+2. Right-click on the commit you would like to create a new branch from and select **Create Branch from Commit**.
+  ![Create branch from commit context menu](/assets/images/help/desktop/create-branch-from-commit-context-menu.png)
+{% data reusables.desktop.name-branch %}
+{% data reusables.desktop.confirm-new-branch-button %}
+  ![Create branch from commit](/assets/images/help/desktop/create-branch-from-commit-overview.png)
+
 ## Publishing a branch
 
 If you create a branch on {% data variables.product.product_name %}, you'll need to publish the branch to make it available for collaboration on {% data variables.product.prodname_dotcom %}.

content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/amending-a-commit.md

@@ -0,0 +1,22 @@
+---
+title: Amending a commit
+intro: 'You can use {% data variables.product.prodname_desktop %} to amend your last commit.'
+versions:
+  free-pro-team: '*'
+---
+
+## About amending a commit
+
+Amending a commit is a way to modify the most recent commit you have made in your current branch. This can be helpful if you need to edit the commit message or if you forgot to include changes in the commit.
+
+You can continue to amend a commit until you push it to the remote repository. After you push a commit, the option to amend it is disabled in {% data variables.product.prodname_desktop %}. When you amend a commit, you replace the previous commit with a new commit to your current branch. Amending a commit that has been pushed to the remote repository could cause confusion for other collaborators working with the repository.
+
+## Amending a commit
+
+{% data reusables.desktop.history-tab %}
+2. Right-click on the most recent commit and select **Amend commit**.
+  ![Amend commit context menu](/assets/images/help/desktop/amend-commit-context-menu.png)
+3. Click the **Summary** field to modify the commit message. Optionally, you can modify or add information about the commit in the **Description** field.
+4. Select any uncommitted changes that you would like to add to the commit. For more information about selecting changes, see "[Committing and reviewing changes to your project](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project#selecting-changes-to-include-in-a-commit)."
+5. Once you have finalized your changes, click **Amend last commit**.
+  ![Amend last commit overview](/assets/images/help/desktop/amend-last-commit-overview.png)

content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/index.md

@@ -0,0 +1,13 @@
+---
+title: Managing commits
+intro: 'You can use {% data variables.product.prodname_desktop %} to amend, cherry-pick, reorder, revert, and squash commits.'
+versions:
+  free-pro-team: '*'
+children:
+  - /reverting-a-commit
+  - /cherry-picking-a-commit
+  - /reordering-commits
+  - /squashing-commits
+  - /amending-a-commit
+  - /managing-tags
+---

content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reordering-commits.md

@@ -0,0 +1,42 @@
+---
+title: Reordering commits
+intro: "You can use {% data variables.product.prodname_desktop %} to reorder commits in your branch's history."
+versions:
+  free-pro-team: '*'
+---
+
+## About reordering a commit
+
+Reordering allows you to alter your commit history to provide a more meaningful progression of commits. {% data variables.product.prodname_desktop %} allows you to drag-and-drop commits in your branch's history to reorder them.
+
+## Reordering a commit
+
+{% data reusables.desktop.current-branch-menu %}
+2. In the list of branches, click the branch with the commits that you want to reorder.
+{% data reusables.desktop.history-tab %}
+4. Drag the commit that you want to reorder and drop it between two adjoining commits.
+  ![reorder drag and drop](/assets/images/help/desktop/reorder-drag-and-drop.png)
+While the application reorders the commits, a **Reorder in process** dialog indicates the progress of the change.
+
+## Error messages when reordering commits
+
+When you reorder commits, you may see one of the following notifications or error messages.
+
+* A notification states that the requested change to the branch will require a force push to update the remote branch. This is shown when the commits that you reordered were previously pushed to the remote branch. Force pushing alters the commit history of the branch and will affect other collaborators who are working in that branch.  Select **Begin reorder** to start the reorder, and then click **Force push origin** to push your changes.
+
+  ![reorder force push dialog](/assets/images/help/desktop/reorder-force-push-dialog.png)
+
+* An error states that the reorder failed because there is a merge commit among the reordered commits.
+
+  ![reorder merge commit dialog](/assets/images/help/desktop/reorder-merge-commit-dialog.png)
+
+* A notification is shown indicating that there are uncommitted changes present on your current branch. Select **Stash Changes and Continue** to store the changes and proceed, or select **Close** to dismiss the message and commit the changes. When there are no longer any uncommitted changes, you can reorder your commits.
+
+  ![reorder stash dialog](/assets/images/help/desktop/reorder-stash-dialog.png)
+
+* A message states that there are merge conflicts that you must resolve before the application can continue reordering commits on your branch.
+    1. Click **View conflicts** to see the conflicts.
+      ![reorder resolve conflicts message](/assets/images/help/desktop/reorder-resolve-conflicts.png)
+    {% data reusables.desktop.resolve-merge-conflicts %}
+   3. When all conflicts are resolved, you can reorder your commits.
+  

content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md

@@ -0,0 +1,52 @@
+---
+title: Squashing commits
+intro: "You can use {% data variables.product.prodname_desktop %} to squash commits in your branch's history."
+versions:
+  free-pro-team: '*'
+---
+
+## About squashing a commit
+
+Squashing allows you to combine multiple commits in your branch's history into a single commit. This can help keep your repository's history more readable and understandable.
+
+## Squashing a commit
+
+{% mac %}
+
+{% data reusables.desktop.current-branch-menu %}
+2. In the list of branches, select the branch that has the commits that you want to squash.
+{% data reusables.desktop.history-tab %}
+4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using <kbd>⌘</kbd> or <kbd>Shift</kbd>.
+  ![squash drag and drop](/assets/images/help/desktop/squash-drag-and-drop.png)
+5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields.
+6. Click **Squash Commmits**.
+
+{% endmac %}
+
+{% windows %}
+
+{% data reusables.desktop.current-branch-menu %}
+2. In the list of branches, select the branch that has the commits that you want to squash.
+{% data reusables.desktop.history-tab %}
+4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
+  ![squash drag and drop](/assets/images/help/desktop/squash-drag-and-drop.png)
+5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields.
+6. Click **Squash Commmits**.
+
+{% endwindows %}
+
+## Error messages when squashing commits
+
+When you squash commits, you may see one of the following notifications or error messages.
+
+* A notification states that the requested change to the branch will require a force push to update the remote branch. Force pushing alters the commit history of the branch and will affect other collaborators who are working in that branch.  Select **Begin Squash** to start the squash, and then click **Force push origin** to push your changes.
+
+  ![squash force push dialog](/assets/images/help/desktop/squash-force-push.png)
+
+* An error states that the squash failed because there is a merge commit among the squashed commits.
+
+  ![reorder merge commit dialog](/assets/images/help/desktop/squash-merge-commit-dialog.png)
+
+* A notification is shown indicating that there are uncommitted changes present on your current branch. Select **Stash Changes and Continue** to store the changes and proceed, or select **Close** to dismiss the message and commit the changes. When there are no longer any uncommitted changes you can squash your commits.
+
+  ![squash stash dialog](/assets/images/help/desktop/squash-stash-dialog.png)

content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md

@@ -426,7 +426,7 @@ Here are a few common problems and some suggested solutions. If you run into any
 
 * **Q:** I'm getting an `Octokit::NotFound` 404 error in my debug output:
     ```
-    2018-12-06 15:00:56 - Octokit::NotFound - POST https://api.github.com/app/installations/500991/access_tokens: 404 - Not Found // See: /v3/apps/#create-a-new-installation-token:
+    2018-12-06 15:00:56 - Octokit::NotFound - POST {% data variables.product.api_url_code %}/app/installations/500991/access_tokens: 404 - Not Found // See: /v3/apps/#create-a-new-installation-token:
     ```
 
     **A:** Ensure the variables in your `.env` file are correct. Make sure that you have not set identical variables in any other environment variable files like `bash_profile`. You can check the environment variables your app is using by adding `puts` statements to your app code and re-running the code. For example, to ensure you have the correct private key set, you could add `puts PRIVATE_KEY` to your app code:

content/developers/apps/guides/using-content-attachments.md

@@ -66,16 +66,16 @@ The content attachment flow shows you the relationship between the URL in the is
 
 The `body` parameter can contain markdown:
 
-    ```shell
-    curl -X POST \
-      https://api.github.com/repos/Codertocat/Hello-World/content_references/17/attachments \
-      -H 'Accept: application/vnd.github.corsair-preview+json' \
-      -H 'Authorization: Bearer $INSTALLATION_TOKEN' \
-      -d '{
-    	"title": "[A-1234] Error found in core/models.py file",
-    	"body": "You have used an email that already exists for the user_email_uniq field.\n ## DETAILS:\n\nThe (email)=(Octocat@github.com) already exists.\n\n The error was found in core/models.py in get_or_create_user at line 62.\n\n self.save()"
-    }'
-    ```
+```shell
+curl -X POST \
+  {% data variables.product.api_url_code %}/repos/Codertocat/Hello-World/content_references/17/attachments \
+  -H 'Accept: application/vnd.github.corsair-preview+json' \
+  -H 'Authorization: Bearer $INSTALLATION_TOKEN' \
+  -d '{
+	"title": "[A-1234] Error found in core/models.py file",
+	"body": "You have used an email that already exists for the user_email_uniq field.\n ## DETAILS:\n\nThe (email)=(Octocat@github.com) already exists.\n\n The error was found in core/models.py in get_or_create_user at line 62.\n\n self.save()"
+}'
+```
 
 For more information about creating an installation token, see "[Authenticating as a GitHub App](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-an-installation)."
 
@@ -111,7 +111,7 @@ mutation {
 Example cURL:
 
 ```shell
-curl -X "POST" "https://api.github.com/graphql" \
+curl -X "POST" "{% data variables.product.api_url_code %}/graphql" \
      -H 'Authorization: Bearer $INSTALLATION_TOKEN' \
      -H 'Accept: application/vnd.github.corsair-preview+json' \
      -H 'Content-Type: application/json; charset=utf-8' \

content/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github.md

@@ -9,6 +9,7 @@ redirect_from:
   - /articles/finding-open-source-projects-on-github
   - /github/getting-started-with-github/finding-open-source-projects-on-github
   - /github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github
+  - /github/getting-started-with-github/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github
 versions:
   free-pro-team: '*'
 topics:

content/get-started/exploring-projects-on-github/following-people.md

@@ -4,6 +4,7 @@ intro: 'You can follow people on {% data variables.product.product_name %} to re
 redirect_from:
   - /articles/following-people
   - /github/getting-started-with-github/following-people
+  - /github/getting-started-with-github/exploring-projects-on-github/following-people
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/exploring-projects-on-github/index.md

@@ -6,6 +6,7 @@ redirect_from:
   - /categories/87/articles/
   - /categories/exploring-projects-on-github/
   - /articles/exploring-projects-on-github
+  - /github/getting-started-with-github/exploring-projects-on-github/
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
@@ -17,3 +18,4 @@ children:
   - /saving-repositories-with-stars
   - /following-people
 ---
+

content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md

@@ -8,6 +8,7 @@ redirect_from:
   - /articles/managing-your-stars/
   - /articles/saving-repositories-with-stars
   - /github/getting-started-with-github/saving-repositories-with-stars
+  - /github/getting-started-with-github/exploring-projects-on-github/saving-repositories-with-stars
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/getting-started-with-git/about-remote-repositories.md

@@ -9,6 +9,7 @@ redirect_from:
   - /github/using-git/which-remote-url-should-i-use
   - /github/using-git/about-remote-repositories
   - /github/getting-started-with-github/about-remote-repositories
+  - /github/getting-started-with-github/getting-started-with-git/about-remote-repositories
 intro: 'GitHub''s collaborative approach to development depends on publishing commits from your local repository to {% data variables.product.product_name %} for other people to view, fetch, and update.'
 versions:
   free-pro-team: '*'

content/get-started/getting-started-with-git/associating-text-editors-with-git.md

@@ -8,6 +8,7 @@ redirect_from:
   - /articles/associating-text-editors-with-git
   - /github/using-git/associating-text-editors-with-git
   - /github/getting-started-with-github/associating-text-editors-with-git
+  - /github/getting-started-with-github/getting-started-with-git/associating-text-editors-with-git
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/getting-started-with-git/caching-your-github-credentials-in-git.md

@@ -6,6 +6,7 @@ redirect_from:
   - /github/using-git/caching-your-github-password-in-git
   - /github/using-git/caching-your-github-credentials-in-git
   - /github/getting-started-with-github/caching-your-github-credentials-in-git
+  - /github/getting-started-with-github/getting-started-with-git/caching-your-github-credentials-in-git
 intro: 'If you''re [cloning {% data variables.product.product_name %} repositories using HTTPS](/github/getting-started-with-github/about-remote-repositories), you can use a credential helper to tell Git to remember your credentials.'
 versions:
   free-pro-team: '*'

content/get-started/getting-started-with-git/configuring-git-to-handle-line-endings.md

@@ -8,6 +8,7 @@ redirect_from:
   - /articles/configuring-git-to-handle-line-endings
   - /github/using-git/configuring-git-to-handle-line-endings
   - /github/getting-started-with-github/configuring-git-to-handle-line-endings
+  - /github/getting-started-with-github/getting-started-with-git/configuring-git-to-handle-line-endings
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/getting-started-with-git/git-workflows.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/git-workflows
   - /github/using-git/git-workflows
   - /github/getting-started-with-github/git-workflows
+  - /github/getting-started-with-github/getting-started-with-git/git-workflows
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/getting-started-with-git/ignoring-files.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/ignoring-files
   - /github/using-git/ignoring-files
   - /github/getting-started-with-github/ignoring-files
+  - /github/getting-started-with-github/getting-started-with-git/ignoring-files
 intro: 'You can configure Git to ignore files you don''t want to check in to {% data variables.product.product_name %}.'
 versions:
   free-pro-team: '*'

content/get-started/getting-started-with-git/index.md

@@ -6,6 +6,7 @@ redirect_from:
   - /github/using-git/getting-started-with-git-and-github
   - /github/using-git/learning-about-git
   - /articles/learning-about-git
+  - /github/getting-started-with-github/getting-started-with-git/
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
@@ -22,3 +23,4 @@ children:
   - /configuring-git-to-handle-line-endings
   - /ignoring-files
 ---
+

content/get-started/getting-started-with-git/managing-remote-repositories.md

@@ -17,6 +17,7 @@ redirect_from:
   - /github/using-git/removing-a-remote
   - /github/using-git/managing-remote-repositories
   - /github/getting-started-with-github/managing-remote-repositories
+  - /github/getting-started-with-github/getting-started-with-git/managing-remote-repositories
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/getting-started-with-git/setting-your-username-in-git.md

@@ -5,6 +5,7 @@ redirect_from:
   - /articles/setting-your-username-in-git
   - /github/using-git/setting-your-username-in-git
   - /github/getting-started-with-github/setting-your-username-in-git
+  - /github/getting-started-with-github/getting-started-with-git/setting-your-username-in-git
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain.md

@@ -6,6 +6,7 @@ redirect_from:
   - /github/using-git/updating-credentials-from-the-osx-keychain
   - /github/using-git/updating-credentials-from-the-macos-keychain
   - /github/getting-started-with-github/updating-credentials-from-the-macos-keychain
+  - /github/getting-started-with-github/getting-started-with-git/updating-credentials-from-the-macos-keychain
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/getting-started-with-git/why-is-git-always-asking-for-my-password.md

@@ -5,6 +5,7 @@ redirect_from:
   - /articles/why-is-git-always-asking-for-my-password
   - /github/using-git/why-is-git-always-asking-for-my-password
   - /github/getting-started-with-github/why-is-git-always-asking-for-my-password
+  - /github/getting-started-with-github/getting-started-with-git/why-is-git-always-asking-for-my-password
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/index.md

@@ -1,6 +1,6 @@
 ---
 title: Getting started with GitHub
-shortTitle: Getting started
+shortTitle: Get started
 intro: 'Learn how to start building, shipping, and maintaining software with {% data variables.product.prodname_dotcom %}. Explore our products, sign up for an account, and connect with the world''s largest development community.'
 redirect_from:
   - /categories/54/articles/
@@ -15,6 +15,7 @@ redirect_from:
   - /categories/19/articles/
   - /categories/using-git
   - /github/using-git
+  - /github/getting-started-with-github/
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/learning-about-github/about-github-advanced-security.md

@@ -10,6 +10,7 @@ topics:
   - Security
 redirect_from:
   - /github/getting-started-with-github/about-github-advanced-security
+  - /github/getting-started-with-github/learning-about-github/about-github-advanced-security
 ---
 ## About {% data variables.product.prodname_GH_advanced_security %}
 

content/get-started/learning-about-github/access-permissions-on-github.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/what-are-the-different-access-permissions/
   - /articles/access-permissions-on-github
   - /github/getting-started-with-github/access-permissions-on-github
+  - /github/getting-started-with-github/learning-about-github/access-permissions-on-github
 intro: 'While you can grant read/write access to collaborators on a personal repository, members of an organization can have more granular access permissions for the organization''s repositories.'
 versions:
   free-pro-team: '*'

content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md

@@ -7,6 +7,7 @@ topics:
   - GitHub
 redirect_from:
   - /github/getting-started-with-github/faq-about-changes-to-githubs-plans
+  - /github/getting-started-with-github/learning-about-github/faq-about-changes-to-githubs-plans
 ---
 ## What plans and pricing changes did GitHub announce on April 14?
 

content/get-started/learning-about-github/github-language-support.md

@@ -9,6 +9,7 @@ topics:
   - GitHub
 redirect_from:
   - /github/getting-started-with-github/github-language-support
+  - /github/getting-started-with-github/learning-about-github/github-language-support
 ---
 <!-- If you make changes to this article, also update any feature-level articles to reflect the same changes in language support. -->
 

content/get-started/learning-about-github/githubs-products.md

@@ -5,6 +5,7 @@ redirect_from:
   - /articles/github-s-products
   - /articles/githubs-products
   - /github/getting-started-with-github/githubs-products
+  - /github/getting-started-with-github/learning-about-github/githubs-products
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/learning-about-github/index.md

@@ -3,6 +3,7 @@ title: Learning about GitHub
 intro: 'Learn how you can use {% data variables.product.company_short %} products to improve your software management process and collaborate with other people.'
 redirect_from:
   - /articles/learning-about-github
+  - /github/getting-started-with-github/learning-about-github/
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
@@ -21,3 +22,4 @@ children:
   - /access-permissions-on-github
   - /faq-about-changes-to-githubs-plans
 ---
+

content/get-started/learning-about-github/types-of-github-accounts.md

@@ -8,6 +8,7 @@ redirect_from:
   - /articles/differences-between-user-and-organization-accounts/
   - /articles/types-of-github-accounts
   - /github/getting-started-with-github/types-of-github-accounts
+  - /github/getting-started-with-github/learning-about-github/types-of-github-accounts
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/quickstart/be-social.md

@@ -4,6 +4,7 @@ redirect_from:
   - /be-social/
   - /articles/be-social
   - /github/getting-started-with-github/be-social
+  - /github/getting-started-with-github/quickstart/be-social
 intro: 'You can interact with people, repositories, and organizations on {% data variables.product.prodname_dotcom %}. See what others are working on and who they''re connecting with from your personal dashboard.'
 versions:
   free-pro-team: '*'

content/get-started/quickstart/communicating-on-github.md

@@ -7,6 +7,7 @@ redirect_from:
   - /articles/about-discussions-in-issues-and-pull-requests/
   - /github/collaborating-with-issues-and-pull-requests/about-conversations-on-github
   - /github/collaborating-with-issues-and-pull-requests/quickstart-for-communicating-on-github
+  - /github/getting-started-with-github/quickstart/communicating-on-github
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/quickstart/create-a-repo.md

@@ -4,6 +4,7 @@ redirect_from:
   - /create-a-repo/
   - /articles/create-a-repo
   - /github/getting-started-with-github/create-a-repo
+  - /github/getting-started-with-github/quickstart/create-a-repo
 intro: 'To put your project up on {% data variables.product.product_location %}, you''ll need to create a repository for it to live in.'
 versions:
   free-pro-team: '*'

content/get-started/quickstart/fork-a-repo.md

@@ -5,6 +5,7 @@ redirect_from:
   - /forking/
   - /articles/fork-a-repo
   - /github/getting-started-with-github/fork-a-repo
+  - /github/getting-started-with-github/quickstart/fork-a-repo
 intro: A fork is a copy of a repository. Forking a repository allows you to freely experiment with changes without affecting the original project.
 versions:
   free-pro-team: '*'

content/get-started/quickstart/git-and-github-learning-resources.md

@@ -5,6 +5,7 @@ redirect_from:
   - /articles/what-are-other-good-resources-for-learning-git-and-github/
   - /articles/git-and-github-learning-resources
   - /github/getting-started-with-github/git-and-github-learning-resources
+  - /github/getting-started-with-github/quickstart/git-and-github-learning-resources
 intro: 'There are a lot of helpful Git and {% data variables.product.product_name %} resources on the web. This is a short list of our favorites!'
 versions:
   free-pro-team: '*'

content/get-started/quickstart/git-cheatsheet.md

@@ -3,6 +3,7 @@ title: Git cheatsheet
 redirect_from:
   - /articles/git-cheatsheet
   - /github/getting-started-with-github/git-cheatsheet
+  - /github/getting-started-with-github/quickstart/git-cheatsheet
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/quickstart/github-flow.md

@@ -7,6 +7,7 @@ redirect_from:
   - /articles/github-flow
   - /github/collaborating-with-issues-and-pull-requests/github-flow
   - /github/getting-started-with-github/github-flow
+  - /github/getting-started-with-github/quickstart/github-flow
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/quickstart/github-glossary.md

@@ -1,9 +1,10 @@
 ---
 title: GitHub glossary
-intro:  'This glossary introduces common Git and {% data variables.product.prodname_dotcom %} terminology.'
+intro: 'This glossary introduces common Git and {% data variables.product.prodname_dotcom %} terminology.'
 redirect_from:
   - /articles/github-glossary
   - /github/getting-started-with-github/github-glossary
+  - /github/getting-started-with-github/quickstart/github-glossary
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/quickstart/index.md

@@ -20,4 +20,7 @@ children:
   - /github-glossary
   - /git-cheatsheet
   - /git-and-github-learning-resources
+redirect_from:
+  - /github/getting-started-with-github/quickstart/
 ---
+

content/get-started/quickstart/set-up-git.md

@@ -11,6 +11,7 @@ redirect_from:
   - /win-set-up-git/
   - /articles/set-up-git
   - /github/getting-started-with-github/set-up-git
+  - /github/getting-started-with-github/quickstart/set-up-git
 intro: 'At the heart of {% data variables.product.product_name %} is an open source version control system (VCS) called Git. Git is responsible for everything {% data variables.product.product_name %}-related that happens locally on your computer.'
 versions:
   free-pro-team: '*'

content/get-started/signing-up-for-github/index.md

@@ -3,6 +3,7 @@ title: Signing up for GitHub
 intro: 'Start using {% data variables.product.prodname_dotcom %} for yourself or your team.'
 redirect_from:
   - /articles/signing-up-for-github
+  - /github/getting-started-with-github/signing-up-for-github/
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
@@ -15,3 +16,4 @@ children:
   - /setting-up-a-trial-of-github-enterprise-cloud
   - /setting-up-a-trial-of-github-enterprise-server
 ---
+

content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md

@@ -4,6 +4,7 @@ intro: 'You can try {% data variables.product.prodname_ghe_cloud %} for free.'
 redirect_from:
   - /articles/setting-up-a-trial-of-github-enterprise-cloud
   - /github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-cloud
+  - /github/getting-started-with-github/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md

@@ -5,6 +5,7 @@ redirect_from:
   - /articles/requesting-a-trial-of-github-enterprise/
   - /articles/setting-up-a-trial-of-github-enterprise-server
   - /github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server
+  - /github/getting-started-with-github/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md

@@ -5,6 +5,7 @@ intro: '{% data variables.product.product_name %} offers user accounts for indiv
 redirect_from:
   - /articles/signing-up-for-a-new-github-account
   - /github/getting-started-with-github/signing-up-for-a-new-github-account
+  - /github/getting-started-with-github/signing-up-for-github/signing-up-for-a-new-github-account
 versions:
   free-pro-team: '*'
 topics:

content/get-started/signing-up-for-github/verifying-your-email-address.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/setting-up-email-verification/
   - /articles/verifying-your-email-address
   - /github/getting-started-with-github/verifying-your-email-address
+  - /github/getting-started-with-github/signing-up-for-github/verifying-your-email-address
 versions:
   free-pro-team: '*'
 topics:

content/get-started/using-git/about-git-rebase.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/about-git-rebase
   - /github/using-git/about-git-rebase
   - /github/getting-started-with-github/about-git-rebase
+  - /github/getting-started-with-github/using-git/about-git-rebase
 intro: 'The `git rebase` command allows you to easily change a series of commits, modifying the history of your repository. You can reorder, edit, or squash commits together.'
 versions:
   free-pro-team: '*'

content/get-started/using-git/about-git-subtree-merges.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/about-git-subtree-merges
   - /github/using-git/about-git-subtree-merges
   - /github/getting-started-with-github/about-git-subtree-merges
+  - /github/getting-started-with-github/using-git/about-git-subtree-merges
 intro: 'If you need to manage multiple projects within a single repository, you can use a *subtree merge* to handle all the references.'
 versions:
   free-pro-team: '*'

content/get-started/using-git/dealing-with-non-fast-forward-errors.md

@@ -5,6 +5,7 @@ redirect_from:
   - /articles/dealing-with-non-fast-forward-errors
   - /github/using-git/dealing-with-non-fast-forward-errors
   - /github/getting-started-with-github/dealing-with-non-fast-forward-errors
+  - /github/getting-started-with-github/using-git/dealing-with-non-fast-forward-errors
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/using-git/getting-changes-from-a-remote-repository.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/getting-changes-from-a-remote-repository
   - /github/using-git/getting-changes-from-a-remote-repository
   - /github/getting-started-with-github/getting-changes-from-a-remote-repository
+  - /github/getting-started-with-github/using-git/getting-changes-from-a-remote-repository
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/using-git/index.md

@@ -9,6 +9,7 @@ redirect_from:
   - /categories/advanced-git/
   - /articles/using-advanced-git-commands
   - /github/using-git/changing-author-info
+  - /github/getting-started-with-github/using-git/
 versions:
   free-pro-team: '*'
   enterprise-server: '*'
@@ -23,3 +24,4 @@ children:
   - /using-git-rebase-on-the-command-line
   - /resolving-merge-conflicts-after-a-git-rebase
 ---
+

content/get-started/using-git/pushing-commits-to-a-remote-repository.md

@@ -6,6 +6,7 @@ redirect_from:
   - /articles/pushing-commits-to-a-remote-repository
   - /github/using-git/pushing-commits-to-a-remote-repository
   - /github/getting-started-with-github/pushing-commits-to-a-remote-repository
+  - /github/getting-started-with-github/using-git/pushing-commits-to-a-remote-repository
 versions:
   free-pro-team: '*'
   enterprise-server: '*'

content/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase.md

@@ -5,6 +5,7 @@ redirect_from:
   - /articles/resolving-merge-conflicts-after-a-git-rebase
   - /github/using-git/resolving-merge-conflicts-after-a-git-rebase
   - /github/getting-started-with-github/resolving-merge-conflicts-after-a-git-rebase
+  - /github/getting-started-with-github/using-git/resolving-merge-conflicts-after-a-git-rebase
 versions:
   free-pro-team: '*'
   enterprise-server: '*'