diff --git a/assets/images/help/branches/pr-retargeting-diagram1.png b/assets/images/help/branches/pr-retargeting-diagram1.png index abec87c5d7..5241f85934 100644 Binary files a/assets/images/help/branches/pr-retargeting-diagram1.png and b/assets/images/help/branches/pr-retargeting-diagram1.png differ diff --git a/assets/images/help/branches/pr-retargeting-diagram2.png b/assets/images/help/branches/pr-retargeting-diagram2.png index 67805d5000..81a3ea13ee 100644 Binary files a/assets/images/help/branches/pr-retargeting-diagram2.png and b/assets/images/help/branches/pr-retargeting-diagram2.png differ diff --git a/content/pull-requests/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 index 5f26926286..b14dec6166 100644 --- a/content/pull-requests/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 @@ -44,15 +44,15 @@ After a pull request has been merged, or closed, you can delete the head branch {% data reusables.pull_requests.retargeted-on-branch-deletion %} The following diagrams illustrate this. - Here someone has created a branch called `feature1` from the `master` branch, and you've then created a branch called `feature2` from `feature1`. There are open pull requests for both branches. The arrows indicate the current base branch for each pull request. At this point, `feature1` is the base branch for `feature2`. If the pull request for `feature2` is merged now, the `feature2` branch will be merged into `feature1`. + Here someone has created a branch called `feature1` from the `main` branch, and you've then created a branch called `feature2` from `feature1`. There are open pull requests for both branches. The arrows indicate the current base branch for each pull request. At this point, `feature1` is the base branch for `feature2`. If the pull request for `feature2` is merged now, the `feature2` branch will be merged into `feature1`. ![merge-pull-request-button](/assets/images/help/branches/pr-retargeting-diagram1.png) -In the next diagram, someone has merged the pull request for `feature1` into the `master` branch, and they have deleted the `feature1` branch. As a result, {% data variables.product.prodname_dotcom %} has automatically retargeted the pull request for `feature2` so that its base branch is now `master`. +In the next diagram, someone has merged the pull request for `feature1` into the `main` branch, and they have deleted the `feature1` branch. As a result, {% data variables.product.prodname_dotcom %} has automatically retargeted the pull request for `feature2` so that its base branch is now `main`. ![merge-pull-request-button](/assets/images/help/branches/pr-retargeting-diagram2.png) -Now when you merge the `feature2` pull request, it'll be merged into the `master` branch. +Now when you merge the `feature2` pull request, it'll be merged into the `main` branch. ## Working with protected branches