cleaning up trailing slash redirects (part 9) (#23781)
This commit is contained in:
Peter Bengtsson
@@ -2,7 +2,7 @@
|
||||
title: Addressing merge conflicts
|
||||
intro: 'If your changes have merge conflicts with the base branch, you must address the merge conflicts before you can merge your pull request''s changes.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts/
|
||||
- /github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts
|
||||
- /articles/addressing-merge-conflicts
|
||||
- /github/collaborating-with-pull-requests/addressing-merge-conflicts
|
||||
versions:
|
||||
|
||||
@@ -3,7 +3,7 @@ title: Resolving a merge conflict using the command line
|
||||
intro: You can resolve merge conflicts using the command line and a text editor.
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line
|
||||
- /articles/resolving-a-merge-conflict-from-the-command-line/
|
||||
- /articles/resolving-a-merge-conflict-from-the-command-line
|
||||
- /articles/resolving-a-merge-conflict-using-the-command-line
|
||||
- /github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line
|
||||
- /github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line
|
||||
|
||||
@@ -3,7 +3,7 @@ title: About status checks
|
||||
intro: Status checks let you know if your commits meet the conditions set for the repository you're contributing to.
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks
|
||||
- /articles/about-statuses/
|
||||
- /articles/about-statuses
|
||||
- /articles/about-status-checks
|
||||
- /github/collaborating-with-issues-and-pull-requests/about-status-checks
|
||||
- /github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks
|
||||
|
||||
@@ -3,7 +3,7 @@ title: About pull request merges
|
||||
intro: 'You can [merge pull requests](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request) by retaining all the commits in a feature branch, squashing all commits into a single commit, or by rebasing individual commits from the `head` branch onto the `base` branch.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges
|
||||
- /articles/about-pull-request-merge-squashing/
|
||||
- /articles/about-pull-request-merge-squashing
|
||||
- /articles/about-pull-request-merges
|
||||
- /github/collaborating-with-issues-and-pull-requests/about-pull-request-merges
|
||||
- /github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
title: Incorporating changes from a pull request
|
||||
intro: 'You can propose changes to your work on {% data variables.product.product_name %} through pull requests. Learn how to create, manage, and merge pull requests.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/incorporating-changes-from-a-pull-request/
|
||||
- /github/collaborating-with-issues-and-pull-requests/incorporating-changes-from-a-pull-request
|
||||
- /articles/incorporating-changes-from-a-pull-request
|
||||
- /github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request
|
||||
versions:
|
||||
|
||||
@@ -3,7 +3,7 @@ title: About branches
|
||||
intro: 'Use a branch to isolate development work without affecting other branches in the repository. Each repository has one default branch, and can have multiple other branches. You can merge a branch into another branch using a pull request.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches
|
||||
- /articles/working-with-protected-branches/
|
||||
- /articles/working-with-protected-branches
|
||||
- /articles/about-branches
|
||||
- /github/collaborating-with-issues-and-pull-requests/about-branches
|
||||
- /github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches
|
||||
|
||||
@@ -3,7 +3,7 @@ title: About pull requests
|
||||
intro: 'Pull requests let you tell others about changes you''ve pushed to a branch in a repository on {% data variables.product.product_name %}. Once a pull request is opened, you can discuss and review the potential changes with collaborators and add follow-up commits before your changes are merged into the base branch.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
|
||||
- /articles/using-pull-requests/
|
||||
- /articles/using-pull-requests
|
||||
- /articles/about-pull-requests
|
||||
- /github/collaborating-with-issues-and-pull-requests/about-pull-requests
|
||||
- /github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
|
||||
|
||||
@@ -3,7 +3,7 @@ title: Creating and deleting branches within your repository
|
||||
intro: 'You can create or delete branches directly on {% data variables.product.product_name %}.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository
|
||||
- /articles/deleting-branches-in-a-pull-request/
|
||||
- /articles/deleting-branches-in-a-pull-request
|
||||
- /articles/creating-and-deleting-branches-within-your-repository
|
||||
- /github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository
|
||||
versions:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
title: Proposing changes to your work with pull requests
|
||||
intro: 'After you add changes to a topic branch or fork, you can open a pull request to ask your collaborators or the repository administrator to review your changes before merging them into the project.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/
|
||||
- /github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests
|
||||
- /articles/proposing-changes-to-your-work-with-pull-requests
|
||||
- /github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests
|
||||
versions:
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
title: Commenting on a pull request
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request
|
||||
- /articles/adding-commit-comments/
|
||||
- /articles/commenting-on-the-diff-of-a-pull-request/
|
||||
- /articles/commenting-on-differences-between-files/
|
||||
- /articles/adding-commit-comments
|
||||
- /articles/commenting-on-the-diff-of-a-pull-request
|
||||
- /articles/commenting-on-differences-between-files
|
||||
- /articles/commenting-on-a-pull-request
|
||||
- /github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request
|
||||
- /github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request
|
||||
|
||||
@@ -3,7 +3,7 @@ title: Filtering files in a pull request
|
||||
intro: 'To help you quickly review changes in a large pull request, you can filter changed files.'
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request
|
||||
- /articles/filtering-files-in-a-pull-request-by-file-type/
|
||||
- /articles/filtering-files-in-a-pull-request-by-file-type
|
||||
- /articles/filtering-files-in-a-pull-request
|
||||
- /github/collaborating-with-issues-and-pull-requests/filtering-files-in-a-pull-request
|
||||
- /github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
---
|
||||
title: Reviewing changes in pull requests
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests/
|
||||
- /articles/reviewing-and-discussing-changes-in-pull-requests/
|
||||
- /github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests
|
||||
- /articles/reviewing-and-discussing-changes-in-pull-requests
|
||||
- /articles/reviewing-changes-in-pull-requests
|
||||
- /github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests
|
||||
intro: 'After a pull request has been opened, you can review and discuss the set of proposed changes.'
|
||||
|
||||
Reference in New Issue
Block a user