From f79751a092f6ccd0baf5597a94e11e7d15207d54 Mon Sep 17 00:00:00 2001 From: Aditya Patel Date: Mon, 18 Oct 2021 10:40:47 +0530 Subject: [PATCH 1/7] updated the docs of merging multiple user accounts (#11082) --- .../merging-multiple-user-accounts.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md index 37b9b51d71..d62ae7d258 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md @@ -23,6 +23,7 @@ shortTitle: Merge multiple user accounts 1. [Transfer any repositories](/articles/how-to-transfer-a-repository) from the account you want to delete to the account you want to keep. Issues, pull requests, and wikis are transferred as well. Verify the repositories exist on the account you want to keep. 2. [Update the remote URLs](/github/getting-started-with-github/managing-remote-repositories) in any local clones of the repositories that were moved. 3. [Delete the account](/articles/deleting-your-user-account) you no longer want to use. +4. If any commits were made with your email address from the original account, add that address to the remaining account to ensure your contributions are attributed to this account. ## Further reading From 21ae64fa62380e621d18ad29b298938caa4c904c Mon Sep 17 00:00:00 2001 From: Josh Bruce Date: Mon, 18 Oct 2021 18:43:06 -0500 Subject: [PATCH 2/7] First time contributor The UI doesn't say "Require pull request review before merging" it says "Require pull request before merging," which seems to be leading to some confusion on the feature. I'm trying to protect `main` from being pushed to directly by anyone, including myself (admin). For my projects it's mainly just me and my public stuff isn't really popular. I sometimes find myself working in `main` unexpectedly (after deleting a branch and pulling in the update). Creating a branch rule and enabling require PR seems to be the suggested or desired behavior to achieving this restrict push: - https://stackoverflow.com/questions/46146491/prevent-pushing-to-master-on-github - https://github.community/t/how-to-disable-require-approvals-for-a-protected-branch-with-require-a-pull-request-before-merging/205555 As of this writing, the combination of "Require pull request before merging" and "Include administrators" can cause me to be unable to merge anything I submit; because I can't approve my own (good policy - just not conducive to what I'm hoping to accomplish). Another options seems to be modifying Git directly, which seems like a workaround given this feature seems purpose built to handle this: - https://hiltonmeyer.com/articles/protect-git-branch-and-prevent-master-push.html Being able to uncheck the disabled checkbox for "Required approving reviews" would be helpful; or, adding a 0 option from the drop down, which would make the feature able to do what its name implies (a PR is required before merge - no push allowed). Or, updating the UI label to be "Require pull request *review* before merging" - which wouldn't solve the desire to have a way to require a pull request. Apologies if this feels like a feature request inside of a documentation recommendation. The purpose of the submission is to ensure the documentation text matches the current UI text (or maybe get the UI updated to match the documentation) - and to help lead users to a solution to the problem of wanting to require pull requests on certain branches; with or without a review and approval. --- .../managing-a-branch-protection-rule.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md index da87de92cf..2b40bf2e3c 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md @@ -51,9 +51,9 @@ When you create a branch rule, the branch you specify doesn't have to exist yet {% data reusables.repositories.repository-branches %} {% data reusables.repositories.add-branch-protection-rules %} 1. Optionally, enable required pull request reviews. - - Under "Protect matching branches", select **Require pull request reviews before merging**. + - Under "Protect matching branches", select **Require pull request before merging**. ![Pull request review restriction checkbox](/assets/images/help/repository/PR-reviews-required.png) - - Click the **Required approving reviews** drop-down menu, then select the number of approving reviews you'd like to require on the branch. + - Click the **Required approving reviews** drop-down menu, then select the number of approving reviews you'd like to require on the branch. (Note: It is not possible to uncheck required approving reviews, or to select zero approvers. If you are trying to to restrict push and force push to branches and require branching and pull requests, you should try ________ instead.) ![Drop-down menu to select number of required review approvals](/assets/images/help/repository/number-of-required-review-approvals.png) - Optionally, to dismiss a pull request approval review when a code-modifying commit is pushed to the branch, select **Dismiss stale pull request approvals when new commits are pushed**. ![Dismiss stale pull request approvals when new commits are pushed checkbox](/assets/images/help/repository/PR-reviews-required-dismiss-stale.png) From 14183c2d8068b535b36474cc0a9d0bdee6104b1a Mon Sep 17 00:00:00 2001 From: Anil Seervi Date: Tue, 19 Oct 2021 09:48:17 +0530 Subject: [PATCH 3/7] Delete settings-sidebar-blocked-users.png --- .../settings/settings-sidebar-blocked-users.png | Bin 7370 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 assets/images/help/settings/settings-sidebar-blocked-users.png diff --git a/assets/images/help/settings/settings-sidebar-blocked-users.png b/assets/images/help/settings/settings-sidebar-blocked-users.png deleted file mode 100644 index b17722204c1ed5ab37d9449c0651d51fce4df30d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7370 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 Date: Tue, 19 Oct 2021 09:49:36 +0530 Subject: [PATCH 4/7] Update settings-sidebar-blocked-users.png image --- .../settings/settings-sidebar-blocked-users.png | Bin 0 -> 10987 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/images/help/settings/settings-sidebar-blocked-users.png diff --git a/assets/images/help/settings/settings-sidebar-blocked-users.png b/assets/images/help/settings/settings-sidebar-blocked-users.png new file mode 100644 index 0000000000000000000000000000000000000000..6056f646389ef98cee59b76947e244d3d763347d GIT binary patch literal 10987 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 XAb+&>{Ptbg|AQ&Ws>oDJn*{wIm&|Iu literal 0 HcmV?d00001 From 9a3e2f043d1dad7a79083eb7608341797892fb97 Mon Sep 17 00:00:00 2001 From: Anil Seervi Date: Tue, 19 Oct 2021 09:51:44 +0530 Subject: [PATCH 5/7] Update content --- data/reusables/user_settings/blocked_users.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/user_settings/blocked_users.md b/data/reusables/user_settings/blocked_users.md index 8de8289d9a..5a9a5dfc68 100644 --- a/data/reusables/user_settings/blocked_users.md +++ b/data/reusables/user_settings/blocked_users.md @@ -1,2 +1,2 @@ -1. In your user settings sidebar, click **Blocked users**. +1. In your user settings sidebar, click **Blocked users** under **Moderation settings**. ![Blocked users tab](/assets/images/help/settings/settings-sidebar-blocked-users.png) From c0be32fbb2f0f713bc69425cd481caabe312de77 Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Tue, 19 Oct 2021 14:35:53 -0500 Subject: [PATCH 6/7] Add :nail_care: --- .../managing-a-branch-protection-rule.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md index 2b40bf2e3c..6c803bdfb2 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md @@ -51,9 +51,9 @@ When you create a branch rule, the branch you specify doesn't have to exist yet {% data reusables.repositories.repository-branches %} {% data reusables.repositories.add-branch-protection-rules %} 1. Optionally, enable required pull request reviews. - - Under "Protect matching branches", select **Require pull request before merging**. + - Under "Protect matching branches", select **Require a pull request before merging**. ![Pull request review restriction checkbox](/assets/images/help/repository/PR-reviews-required.png) - - Click the **Required approving reviews** drop-down menu, then select the number of approving reviews you'd like to require on the branch. (Note: It is not possible to uncheck required approving reviews, or to select zero approvers. If you are trying to to restrict push and force push to branches and require branching and pull requests, you should try ________ instead.) + - Click the **Required approving reviews** drop-down menu, then select the number of approving reviews you'd like to require on the branch. ![Drop-down menu to select number of required review approvals](/assets/images/help/repository/number-of-required-review-approvals.png) - Optionally, to dismiss a pull request approval review when a code-modifying commit is pushed to the branch, select **Dismiss stale pull request approvals when new commits are pushed**. ![Dismiss stale pull request approvals when new commits are pushed checkbox](/assets/images/help/repository/PR-reviews-required-dismiss-stale.png) From bde34f86dcf1ffcc01b0a67ab900b6b1be61a23d Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Tue, 19 Oct 2021 14:42:31 -0500 Subject: [PATCH 7/7] Add :nail_care: --- .../merging-multiple-user-accounts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md index d62ae7d258..0e1db56667 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md @@ -23,7 +23,7 @@ shortTitle: Merge multiple user accounts 1. [Transfer any repositories](/articles/how-to-transfer-a-repository) from the account you want to delete to the account you want to keep. Issues, pull requests, and wikis are transferred as well. Verify the repositories exist on the account you want to keep. 2. [Update the remote URLs](/github/getting-started-with-github/managing-remote-repositories) in any local clones of the repositories that were moved. 3. [Delete the account](/articles/deleting-your-user-account) you no longer want to use. -4. If any commits were made with your email address from the original account, add that address to the remaining account to ensure your contributions are attributed to this account. +4. To attribute past commits to the new account, add the email address you used to author the commits to the account you're keeping. For more information, see "[Why are my contributions not showing up on my profile?](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile#your-local-git-commit-email-isnt-connected-to-your-account)" ## Further reading