jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-19 18:10:59 -05:00
Code Issues Projects Releases Wiki Activity

Commonmark split up reusable to work with newlines in lists (#42895)

Browse Source
This commit is contained in:
Rachael Sewell
2023-09-19 14:44:11 -07:00
committed by GitHub
parent 9a8965c242
commit 1fadc01a8d
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md
View File

@@ -52,6 +52,8 @@ Signing commits differs from signing off on a commit. For more information about
{% data reusables.pull_requests.rebase_and_merge_verification %}
{% data reusables.pull_requests.rebase_and_merge_verification_2 %}
For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github#rebasing-and-merging-your-commits)."
{% ifversion fpt or ghec %}

4
content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
View File

@@ -45,6 +45,8 @@ For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-me
Before enabling commit rebasing, consider these disadvantages:
- Repository contributors may have to rebase on the command line, resolve any conflicts, and force push their changes to the pull request's topic branch (or remote head branch) before they can use the **rebase and merge** option on {% data variables.location.product_location %}. Force pushing must be done carefully so contributors don't overwrite work that others have based their work on. To learn more about when the **Rebase and merge** option is disabled on {% data variables.location.product_location %} and the workflow to re-enable it, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#rebase-and-merge-your-pull-request-commits)."
- {% indented_data_reference reusables.pull_requests.rebase_and_merge_verification spaces=3 %}
- {% indented_data_reference reusables.pull_requests.rebase_and_merge_verification spaces=2 %}
{% indented_data_reference reusables.pull_requests.rebase_and_merge_verification_2 spaces=2 %}
For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests)."

2
data/reusables/pull_requests/rebase_and_merge_verification.md
View File

@@ -1,5 +1,3 @@
When using the **Rebase and Merge** option on a pull request, it's important to note that the commits in the head branch are added to the base branch without commit signature verification.
When you use this option, {% data variables.product.prodname_dotcom %} creates a modified commit, using the data and content of the original commit. This means that {% data variables.product.prodname_dotcom %} didn't truly create this commit, and can't therefore sign it as a generic system user.
{% data variables.product.prodname_dotcom %} doesn't have access to the committer's private signing keys, so it can't sign the commit on the user's behalf.
A workaround for this is to rebase and merge locally, and then push the changes to the pull request's base branch.

1
data/reusables/pull_requests/rebase_and_merge_verification_2.md Normal file
View File

@@ -0,0 +1 @@
A workaround for this is to rebase and merge locally, and then push the changes to the pull request's base branch.