diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md index 4f6d51746c..5e6f9ca772 100644 --- a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md +++ b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md @@ -57,4 +57,4 @@ Anyone with write permissions in the repository, can then [merge the changes](/a ## Further reading - "[About pull requests](/articles/about-pull-requests/)" -- "[Addressing merge conflicts](/github/collaborating-with-pull-requests/addressing-merge-conflicts" +- "[Addressing merge conflicts](/github/collaborating-with-pull-requests/addressing-merge-conflicts)" diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md index 650ccd73ba..3dd13c576c 100644 --- a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md @@ -103,4 +103,4 @@ gh pr merge 523 --squash --body "my squash commit" --delete-branch - "[Reverting a pull request](/articles/reverting-a-pull-request)" - "[Syncing your branch](/desktop/guides/contributing-to-projects/syncing-your-branch/)" using {% data variables.product.prodname_desktop %} - "[About pull request merges](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)" -- "[Addressing merge conflicts](/github/collaborating-with-pull-requests/addressing-merge-conflicts" +- "[Addressing merge conflicts](/github/collaborating-with-pull-requests/addressing-merge-conflicts)" diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/merging-an-upstream-repository-into-your-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/merging-an-upstream-repository-into-your-fork.md index 59529c3ff9..62c7338350 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/merging-an-upstream-repository-into-your-fork.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/merging-an-upstream-repository-into-your-fork.md @@ -25,7 +25,7 @@ shortTitle: Merge an upstream repo ```shell $ git pull https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME ``` -5. If there are conflicts, resolve them. For more information, see "[Addressing merge conflicts](/github/collaborating-with-pull-requests/addressing-merge-conflicts". +5. If there are conflicts, resolve them. For more information, see "[Addressing merge conflicts](/github/collaborating-with-pull-requests/addressing-merge-conflicts)". 6. Commit the merge. 7. Review the changes and ensure they are satisfactory. 8. Push the merge to your GitHub repository.