diff --git a/content/github/index.md b/content/github/index.md index 151b7b550b..9deb6fc188 100644 --- a/content/github/index.md +++ b/content/github/index.md @@ -13,8 +13,6 @@ children: - /copilot - /setting-up-and-managing-your-enterprise - /writing-on-github - - /committing-changes-to-your-project - - /collaborating-with-pull-requests - /searching-for-information-on-github - /importing-your-projects-to-github - /managing-security-vulnerabilities @@ -26,4 +24,3 @@ children: - /site-policy - /site-policy-deprecated --- - diff --git a/content/index.md b/content/index.md index 12ab7e6cd6..abd12e6cb3 100644 --- a/content/index.md +++ b/content/index.md @@ -7,7 +7,6 @@ featuredLinks: - /repositories/creating-and-managing-repositories - /github/writing-on-github/basic-writing-and-formatting-syntax popular: - - /github/collaborating-with-issues-and-pull-requests/about-pull-requests - /github/authenticating-to-github - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line - /github/getting-started-with-github/managing-remote-repositories @@ -23,6 +22,7 @@ children: - billing - organizations - code-security + - pull-requests - issues - actions - codespaces @@ -55,4 +55,3 @@ externalProducts: href: 'https://codeql.github.com/docs' external: true --- - diff --git a/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md similarity index 99% rename from content/github/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md rename to content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md index dfacd92cb1..6ff5faed1f 100644 --- a/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md +++ b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md @@ -5,6 +5,7 @@ redirect_from: - /github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts/about-merge-conflicts - /articles/about-merge-conflicts - /github/collaborating-with-issues-and-pull-requests/about-merge-conflicts + - /github/about-merge-conflicts versions: fpt: '*' ghes: '*' diff --git a/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/index.md b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/addressing-merge-conflicts/index.md rename to content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/index.md diff --git a/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md similarity index 97% rename from content/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md rename to content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md index 7636956c58..0a6613ff07 100644 --- a/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md +++ b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md @@ -5,6 +5,7 @@ redirect_from: - /github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github - /articles/resolving-a-merge-conflict-on-github - /github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github + - /github/resolving-a-merge-conflict-on-github versions: fpt: '*' ghes: '*' @@ -44,15 +45,15 @@ If a site administrator disables the merge conflict editor for pull requests bet ![Select next conflicting file if applicable](/assets/images/help/pull_requests/resolve-merge-conflict-select-conflicting-file.png) 1. Once you've resolved all your merge conflicts, click **Commit merge**. This merges the entire base branch into your head branch. ![Resolve merge conflicts button](/assets/images/help/pull_requests/merge-conflict-commit-changes.png) -1. If prompted, review the branch that you are committing to. +1. If prompted, review the branch that you are committing to. If the head branch is the default branch of the repository, you can choose either to update this branch with the changes you made to resolve the conflict, or to create a new branch and use this as the head branch of the pull request. ![Prompt to review the branch that will be updated](/assets/images/help/pull_requests/conflict-resolution-merge-dialog-box.png) - + If you choose to create a new branch, enter a name for the branch. - + If the head branch of your pull request is protected you must create a new branch. You won't get the option to update the protected branch. - + Click **Create branch and update my pull request** or **I understand, continue updating _BRANCH_**. The button text corresponds to the action you are performing. 1. To merge your pull request, click **Merge pull request**. For more information about other pull request merge options, see "[Merging a pull request](/articles/merging-a-pull-request/)." diff --git a/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md similarity index 97% rename from content/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md rename to content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md index 07c81494e9..fdf549b40b 100644 --- a/content/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md +++ b/content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line.md @@ -125,5 +125,5 @@ You can now merge the branches on the command line or [push your changes to your ## Further reading -- "[About merge conflicts](/articles/about-merge-conflicts)" +- "[About merge conflicts](/articlespull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts)" - "[Checking out pull requests locally](/articles/checking-out-pull-requests-locally/)" diff --git a/content/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md b/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md similarity index 100% rename from content/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md rename to content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks.md diff --git a/content/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/index.md b/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/index.md rename to content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/index.md diff --git a/content/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/working-with-pre-receive-hooks.md b/content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/working-with-pre-receive-hooks.md similarity index 100% rename from content/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/working-with-pre-receive-hooks.md rename to content/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/working-with-pre-receive-hooks.md diff --git a/content/github/collaborating-with-pull-requests/getting-started/about-collaborative-development-models.md b/content/pull-requests/collaborating-with-pull-requests/getting-started/about-collaborative-development-models.md similarity index 100% rename from content/github/collaborating-with-pull-requests/getting-started/about-collaborative-development-models.md rename to content/pull-requests/collaborating-with-pull-requests/getting-started/about-collaborative-development-models.md diff --git a/content/github/collaborating-with-pull-requests/getting-started/index.md b/content/pull-requests/collaborating-with-pull-requests/getting-started/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/getting-started/index.md rename to content/pull-requests/collaborating-with-pull-requests/getting-started/index.md diff --git a/content/github/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 similarity index 100% rename from content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md rename to content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md diff --git a/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/closing-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/closing-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/closing-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/closing-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md rename to content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md diff --git a/content/github/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 similarity index 100% rename from content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/index.md b/content/pull-requests/collaborating-with-pull-requests/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/index.md rename to content/pull-requests/collaborating-with-pull-requests/index.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/index.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/index.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/index.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review.md diff --git a/content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/using-query-parameters-to-create-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/using-query-parameters-to-create-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/using-query-parameters-to-create-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/using-query-parameters-to-create-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/finding-changed-methods-and-functions-in-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/finding-changed-methods-and-functions-in-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/finding-changed-methods-and-functions-in-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/finding-changed-methods-and-functions-in-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/index.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/index.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/index.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md diff --git a/content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/viewing-a-pull-request-review.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/viewing-a-pull-request-review.md similarity index 100% rename from content/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/viewing-a-pull-request-review.md rename to content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/viewing-a-pull-request-review.md diff --git a/content/github/collaborating-with-pull-requests/working-with-forks/about-forks.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks.md similarity index 100% rename from content/github/collaborating-with-pull-requests/working-with-forks/about-forks.md rename to content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks.md diff --git a/content/github/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md similarity index 100% rename from content/github/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md rename to content/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork.md diff --git a/content/github/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork.md similarity index 100% rename from content/github/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork.md rename to content/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork.md diff --git a/content/github/collaborating-with-pull-requests/working-with-forks/index.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/index.md similarity index 100% rename from content/github/collaborating-with-pull-requests/working-with-forks/index.md rename to content/pull-requests/collaborating-with-pull-requests/working-with-forks/index.md diff --git a/content/github/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 similarity index 100% rename from content/github/collaborating-with-pull-requests/working-with-forks/merging-an-upstream-repository-into-your-fork.md rename to content/pull-requests/collaborating-with-pull-requests/working-with-forks/merging-an-upstream-repository-into-your-fork.md diff --git a/content/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md similarity index 100% rename from content/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md rename to content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md diff --git a/content/github/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md similarity index 100% rename from content/github/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md rename to content/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md diff --git a/content/github/committing-changes-to-your-project/creating-and-editing-commits/about-commits.md b/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits.md similarity index 100% rename from content/github/committing-changes-to-your-project/creating-and-editing-commits/about-commits.md rename to content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits.md diff --git a/content/github/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message.md b/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message.md similarity index 100% rename from content/github/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message.md rename to content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message.md diff --git a/content/github/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-on-behalf-of-an-organization.md b/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-on-behalf-of-an-organization.md similarity index 100% rename from content/github/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-on-behalf-of-an-organization.md rename to content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-on-behalf-of-an-organization.md diff --git a/content/github/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md b/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md similarity index 100% rename from content/github/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md rename to content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md diff --git a/content/github/committing-changes-to-your-project/creating-and-editing-commits/index.md b/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/index.md similarity index 100% rename from content/github/committing-changes-to-your-project/creating-and-editing-commits/index.md rename to content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/index.md diff --git a/content/github/committing-changes-to-your-project/index.md b/content/pull-requests/committing-changes-to-your-project/index.md similarity index 100% rename from content/github/committing-changes-to-your-project/index.md rename to content/pull-requests/committing-changes-to-your-project/index.md diff --git a/content/github/committing-changes-to-your-project/troubleshooting-commits/commit-exists-on-github-but-not-in-my-local-clone.md b/content/pull-requests/committing-changes-to-your-project/troubleshooting-commits/commit-exists-on-github-but-not-in-my-local-clone.md similarity index 100% rename from content/github/committing-changes-to-your-project/troubleshooting-commits/commit-exists-on-github-but-not-in-my-local-clone.md rename to content/pull-requests/committing-changes-to-your-project/troubleshooting-commits/commit-exists-on-github-but-not-in-my-local-clone.md diff --git a/content/github/committing-changes-to-your-project/troubleshooting-commits/index.md b/content/pull-requests/committing-changes-to-your-project/troubleshooting-commits/index.md similarity index 100% rename from content/github/committing-changes-to-your-project/troubleshooting-commits/index.md rename to content/pull-requests/committing-changes-to-your-project/troubleshooting-commits/index.md diff --git a/content/github/committing-changes-to-your-project/troubleshooting-commits/why-are-my-commits-linked-to-the-wrong-user.md b/content/pull-requests/committing-changes-to-your-project/troubleshooting-commits/why-are-my-commits-linked-to-the-wrong-user.md similarity index 100% rename from content/github/committing-changes-to-your-project/troubleshooting-commits/why-are-my-commits-linked-to-the-wrong-user.md rename to content/pull-requests/committing-changes-to-your-project/troubleshooting-commits/why-are-my-commits-linked-to-the-wrong-user.md diff --git a/content/github/committing-changes-to-your-project/viewing-and-comparing-commits/commit-branch-and-tag-labels.md b/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/commit-branch-and-tag-labels.md similarity index 100% rename from content/github/committing-changes-to-your-project/viewing-and-comparing-commits/commit-branch-and-tag-labels.md rename to content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/commit-branch-and-tag-labels.md diff --git a/content/github/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md b/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md similarity index 100% rename from content/github/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md rename to content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/comparing-commits.md diff --git a/content/github/committing-changes-to-your-project/viewing-and-comparing-commits/differences-between-commit-views.md b/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/differences-between-commit-views.md similarity index 100% rename from content/github/committing-changes-to-your-project/viewing-and-comparing-commits/differences-between-commit-views.md rename to content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/differences-between-commit-views.md diff --git a/content/github/committing-changes-to-your-project/viewing-and-comparing-commits/index.md b/content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/index.md similarity index 100% rename from content/github/committing-changes-to-your-project/viewing-and-comparing-commits/index.md rename to content/pull-requests/committing-changes-to-your-project/viewing-and-comparing-commits/index.md diff --git a/content/pull-requests/index.md b/content/pull-requests/index.md new file mode 100644 index 0000000000..0397876d6b --- /dev/null +++ b/content/pull-requests/index.md @@ -0,0 +1,14 @@ +--- +title: Pull Requests +intro: 'Learn how you can use pull-requests to collaborate with others and commit changes to your own projects.' +shortTitle: Pull Requests +versions: + fpt: '*' + ghes: '*' + ghae: '*' +topics: + - Pull requests +children: + - /collaborating-with-pull-requests + - /committing-changes-to-your-project +---