From 941d01d95f87f61b97749d860aec1118a4893bf3 Mon Sep 17 00:00:00 2001 From: "Leona B. Campbell" <3880403+runleonarun@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:02:11 -0800 Subject: [PATCH 1/3] Update bad link --- website/docs/docs/collaborate/git/version-control-basics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/docs/collaborate/git/version-control-basics.md b/website/docs/docs/collaborate/git/version-control-basics.md index dc304d99ca6..b2aa6a1875a 100644 --- a/website/docs/docs/collaborate/git/version-control-basics.md +++ b/website/docs/docs/collaborate/git/version-control-basics.md @@ -53,7 +53,7 @@ You can perform git tasks with the git button in the Cloud IDE. The following ar Merge conflicts often occur when multiple users are concurrently making edits to the same section in the same file. This makes it difficult for Git to determine which change should be kept. -Refer to [resolve merge conflicts](/docs/collaborate/git/resolve-merge-conflicts) to learn how to resolve merge conflicts. +Refer to [resolve merge conflicts](/docs/collaborate/git/merge-conflicts) to learn how to resolve merge conflicts. ## The .gitignore file From c6babc0cad6b9b08f073c66978f5f5aaccb35c8a Mon Sep 17 00:00:00 2001 From: mirnawong1 Date: Thu, 5 Dec 2024 17:56:11 +0000 Subject: [PATCH 2/3] update link" --- website/snippets/access_url.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/snippets/access_url.md b/website/snippets/access_url.md index 4fb7aa776ae..90a9238618a 100644 --- a/website/snippets/access_url.md +++ b/website/snippets/access_url.md @@ -1 +1 @@ -The following steps use `YOUR_AUTH0_URI` and `YOUR_AUTH0_ENTITYID`, which need to be replaced with the [appropriate Auth0 SSO URI and Auth0 Entity ID](/docs/cloud/manage-access/set-up-sso-saml-2.0#auth0-multi-tenant-uris) for your region. +The following steps use `YOUR_AUTH0_URI` and `YOUR_AUTH0_ENTITYID`, which need to be replaced with the [appropriate Auth0 SSO URI and Auth0 Entity ID](#auth0-uris) for your region. From 82e807b26463f1caffbc07ef80ef9ae6de753e9d Mon Sep 17 00:00:00 2001 From: mirnawong1 Date: Thu, 5 Dec 2024 18:00:59 +0000 Subject: [PATCH 3/3] remove space --- website/snippets/access_url.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/website/snippets/access_url.md b/website/snippets/access_url.md index 89924d00513..90a9238618a 100644 --- a/website/snippets/access_url.md +++ b/website/snippets/access_url.md @@ -1,3 +1 @@ The following steps use `YOUR_AUTH0_URI` and `YOUR_AUTH0_ENTITYID`, which need to be replaced with the [appropriate Auth0 SSO URI and Auth0 Entity ID](#auth0-uris) for your region. - -