diff --git a/assets/images/help/billing/cancel-pending-changes-org.png b/assets/images/help/billing/cancel-pending-changes-org.png new file mode 100644 index 000000000000..83701dd82c41 Binary files /dev/null and b/assets/images/help/billing/cancel-pending-changes-org.png differ diff --git a/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md b/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md index fb4fc350115f..803665e7a11f 100644 --- a/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md +++ b/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md @@ -37,7 +37,7 @@ When you cancel a pending change, your plan will not change until your next bill {% data reusables.organizations.billing-settings %} {% data reusables.dotcom_billing.review-pending-changes %} -{% data reusables.dotcom_billing.cancel-pending-changes %} +{% data reusables.dotcom_billing.cancel-pending-changes-org %} {% data reusables.dotcom_billing.confirm-cancel-pending-changes %} ## Further reading diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md index 6a1aaa27d82b..b6a1ed7d7640 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md @@ -180,7 +180,8 @@ You can require that changes are successfully deployed to specific environments ### Lock branch -Locking a branch ensures that no commits can be made to the branch. +Locking a branch will make the branch read-only and ensures that no commits can be made to the branch. Locked branches can also not be deleted. + By default, a forked repository does not support syncing from its upstream repository. You can enable **Allow fork syncing** to pull changes from the upstream repository while preventing other contributions to the fork's branch. {% endif %} @@ -227,3 +228,9 @@ If a site administrator has blocked force pushes to the default branch only, you ### Allow deletions By default, you cannot delete a protected branch. When you enable deletion of a protected branch, anyone with at least write permissions to the repository can delete the branch. + +{% note %} + +**Note:** If the branch is locked, you cannot delete the branch even if you have permission to delete it. + +{% endnote %} diff --git a/data/reusables/dotcom_billing/cancel-pending-changes-org.md b/data/reusables/dotcom_billing/cancel-pending-changes-org.md new file mode 100644 index 000000000000..e405ea214abe --- /dev/null +++ b/data/reusables/dotcom_billing/cancel-pending-changes-org.md @@ -0,0 +1,3 @@ +1. Next to the pending change you'd like to cancel, click **Cancel**. + + ![Screenshot the "Current plan" section. After the text "The new price will be $0/year", a link labeled "Cancel" is highlighted with an orange outline.](/assets/images/help/billing/cancel-pending-changes-org.png)