jprdonnelly/docs
1
0
Fork 0
mirror of synced 2026-01-08 03:01:54 -05:00
Code Issues Projects Releases Wiki Activity

Branch was updated using the 'autoupdate branch' Actions workflow.

Browse Source
This commit is contained in:
Octomerger Bot
2021-11-10 11:38:53 -05:00
committed by GitHub
parent 51653b4e69 85293f0135
commit 49cdca45bb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/help/branches/pr-retargeting-diagram1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
assets/images/help/branches/pr-retargeting-diagram2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

6
content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md
View File

@@ -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