Document workstation configurations for contributing to multiple accounts on GitHub.com (#29663)

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/index.md

@@ -1,6 +1,6 @@
 ---
 title: Setting up and managing your personal account on GitHub
-intro: 'You can manage settings for your personal account on {% data variables.product.prodname_dotcom %}, including email preferences, collaborator access for personal repositories, and organization memberships.'
+intro: You can manage settings for your personal account on {% ifversion fpt or ghec or ghes %}{% data variables.product.product_location %}{% elsif ghae %}{% data variables.product.product_name %}{% endif %}, including email preferences, access to personal repositories, and organization memberships. You can also manage the account itself.
 shortTitle: Personal accounts
 redirect_from:
   - /categories/setting-up-and-managing-your-github-user-account
@@ -15,6 +15,7 @@ topics:
   - Accounts
 children:
   - /managing-personal-account-settings
+  - /managing-your-personal-account
   - /managing-email-preferences
   - /managing-access-to-your-personal-repositories
   - /managing-your-membership-in-organizations

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/index.md

@@ -1,6 +1,6 @@
 ---
 title: Managing user account settings
-intro: 'You can change several settings for your personal account, including changing your username and deleting your account.'
+intro: 'You can manage settings for your personal account, including your theme, username, default branch, accessibility, and security settings.'
 redirect_from:
   - /categories/29/articles
   - /categories/user-accounts
@@ -19,9 +19,6 @@ children:
   - /managing-your-theme-settings
   - /managing-your-tab-size-rendering-preference
   - /changing-your-github-username
-  - /merging-multiple-personal-accounts
-  - /converting-a-user-into-an-organization
-  - /deleting-your-personal-account
   - /permission-levels-for-a-personal-account-repository
   - /permission-levels-for-a-project-board-owned-by-a-personal-account
   - /managing-accessibility-settings
@@ -29,7 +26,6 @@ children:
   - /managing-security-and-analysis-settings-for-your-personal-account
   - /managing-access-to-your-personal-accounts-project-boards
   - /integrating-jira-with-your-personal-projects
-  - /best-practices-for-leaving-your-company
   - /what-does-the-available-for-hire-checkbox-do
 shortTitle: Personal account settings
 ---

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/best-practices-for-leaving-your-company.md

@@ -6,6 +6,7 @@ redirect_from:
   - /github/setting-up-and-managing-your-github-user-account/best-practices-for-leaving-your-company
   - /github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/best-practices-for-leaving-your-company
   - /account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/best-practices-for-leaving-your-company
+  - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/best-practices-for-leaving-your-company
 versions:
   fpt: '*'
   ghec: '*'

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md

@@ -7,6 +7,7 @@ redirect_from:
   - /github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization
   - /github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/converting-a-user-into-an-organization
   - /account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/converting-a-user-into-an-organization
+  - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/converting-a-user-into-an-organization
 intro: You can convert your personal account into an organization. This allows more granular permissions for repositories that belong to the organization.
 versions:
   fpt: '*'

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/deleting-your-personal-account.md

@@ -1,38 +1,53 @@
 ---
 title: Deleting your personal account
-intro: 'You can delete your personal account on {% data variables.product.product_name %} at any time.'
+intro: 'You can delete your personal account on {% data variables.product.product_location %} at any time.'
 redirect_from:
   - /articles/deleting-a-user-account
   - /articles/deleting-your-user-account
   - /github/setting-up-and-managing-your-github-user-account/deleting-your-user-account
   - /github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account
   - /account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account
+  - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/deleting-your-personal-account
 versions:
   fpt: '*'
   ghes: '*'
   ghec: '*'
 topics:
   - Accounts
-shortTitle: Delete your personal account
+shortTitle: Delete your account
 ---
-Deleting your personal account removes all repositories, forks of private repositories, wikis, issues, pull requests, and pages owned by your account. {% ifversion fpt or ghec %} Issues and pull requests you've created and comments you've made in repositories owned by other users will not be deleted - instead, they'll be associated with our [Ghost user](https://github.com/ghost).{% else %}Issues and pull requests you've created and comments you've made in repositories owned by other users will not be deleted.{% endif %}
 
-{% ifversion fpt or ghec %} When you delete your account we stop billing you. The email address associated with the account becomes available for use with a different account on {% data variables.product.product_location %}. After 90 days, the account name also becomes available to anyone else to use on a new account. {% endif %}
+## About deletion of your personal account
 
-If you’re the only owner of an organization, you must transfer ownership to another person or delete the organization before you can delete your personal account. If there are other owners in the organization, you must remove yourself from the organization before you can delete your personal account.
+Deleting your personal account removes all repositories, forks of private repositories, wikis, issues, pull requests, and pages owned by your account. {% ifversion fpt or ghec %}Issues and pull requests you've created and comments you've made in repositories owned by other users will not be deleted. Your resources and comments will become associated with the [ghost user](https://github.com/ghost).{% else %}Issues and pull requests you've created and comments you've made in repositories owned by other users will not be deleted.{% endif %}
+
+{% ifversion ghec %}
+
+{% note %}
+
+**Note**: If your enterprise manages your account and you sign into {% data variables.product.product_location %} through your company's identity provider (IdP), you cannot delete your account. For more information, see "[About {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users)."
+
+{% endnote %}
+
+{% endif %}
+
+{% ifversion fpt or ghec %}When you delete your account we stop billing you. The email address associated with the account becomes available for use with a different account on {% data variables.product.product_location %}. After 90 days, the account name also becomes available to anyone else to use on a new account. {% endif %}
+
+If you're the only owner of an organization, you must transfer ownership to another person or delete the organization before you can delete your personal account. If there are other owners in the organization, you must remove yourself from the organization before you can delete your personal account.
+
+For more information, see the following articles.
 
-For more information, see:
 - "[Transferring organization ownership](/articles/transferring-organization-ownership)"
 - "[Deleting an organization account](/articles/deleting-an-organization-account)"
 - "[Removing yourself from an organization](/articles/removing-yourself-from-an-organization/)"
 
 ## Back up your account data
 
-Before you delete your personal account, make a copy of all repositories, private forks, wikis, issues, and pull requests owned by your account.
+Before you delete your personal account, make a copy of all repositories, private forks, wikis, issues, and pull requests owned by your account. For more information, see "[Backing up a repository](/repositories/archiving-a-github-repository/backing-up-a-repository)."
 
 {% warning %}
 
-**Warning:** Once your personal account has been deleted, GitHub cannot restore your content.
+**Warning:** Once your personal account has been deleted, {% ifversion fpt or ghec %}{% data variables.product.company_short %}{% elsif ghes or ghae %}an enterprise owner{% endif %} cannot restore your content.
 
 {% endwarning %}
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/index.md

@@ -0,0 +1,19 @@
+---
+title: Managing your personal account
+intro: 'You can manage your personal account on {% ifversion fpt or ghec or ghes %}{% data variables.product.product_location %}{% elsif ghae %}{% data variables.product.product_name %}{% endif %}. For example, you can {% ifversion fpt or ghec %}manage multiple accounts, {% endif %}convert an account to an organization{% ifversion fpt or ghec or ghes %}, or delete an account{% endif %}.'
+shortTitle: Manage personal account
+versions:
+  fpt: '*'
+  ghes: '*'
+  ghae: '*'
+  ghec: '*'
+topics:
+  - Accounts
+children:
+  - /managing-multiple-accounts
+  - /merging-multiple-personal-accounts
+  - /converting-a-user-into-an-organization
+  - /best-practices-for-leaving-your-company
+  - /deleting-your-personal-account
+---
+

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/managing-multiple-accounts.md

@@ -0,0 +1,105 @@
+---
+title: Managing multiple accounts
+intro: 'If you use one workstation to contribute to projects for more than one account on {% data variables.product.product_location %}, you can modify your Git configuration to simplify the contribution process.'
+versions:
+  feature: multiple-accounts-one-workstation
+topics:
+  - Accounts
+  - Git
+  - GitHub
+shortTitle: Manage multiple accounts
+---
+
+## About management of multiple accounts
+
+In some cases, you may need to use multiple accounts on {% data variables.product.product_location %}. For example, you may have a personal account for open source contributions, and your employer may also create and manage a user account for you within an enterprise. 
+
+You cannot use your {% data variables.product.prodname_managed_user %} to contribute to public projects on {% data variables.product.product_location %}, so you must contribute to those resources using your personal account. For more information, see "[About  {% data variables.product.prodname_emus %}]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users#abilities-and-restrictions-of-managed-user-accounts){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% elsif ghec %}."{% endif %}
+
+If you want to use one workstation to contribute from both accounts, you can simplify contribution with Git by using a mixture of protocols to access repository data, or by using credentials on a per-repository basis.
+
+{% warning %}
+
+**Warning**: Be mindful when you use one workstation to contribute to two separate accounts. Management of two or more accounts can increase the chance of mistakenly leaking internal code to the public.
+
+{% endwarning %}
+
+If you aren't required to use a {% data variables.product.prodname_managed_user %}, {% data variables.product.company_short %} recommends that you use one personal account for all your work on {% data variables.product.product_location %}. With a single personal account, you can contribute to a combination of personal, open source, or professional projects using one identity. Other people can invite the account to contribute to both individual repositories and repositories owned by an organization, and the account can be a member of multiple organizations or enterprises.
+
+## Contributing to two accounts using HTTPS and SSH
+
+If you contribute with two accounts from one workstation, you can access repositories by using a different protocol and credentials for each account. 
+
+Git can use either the HTTPS or SSH protocol to access and update data in repositories on {% data variables.product.product_location %}. The protocol you use to clone a repository determines which credentials your workstation will use to authenticate when you access the repository. With this approach to account management, you store the credentials for one account to use for HTTPS connections and upload an SSH key to the other account to use for SSH connections.
+
+You can find both the HTTPS or an SSH URLs for cloning a repository on {% data variables.product.product_name %}. For more information, see "[Cloning a repository](/repositories/creating-and-managing-repositories/cloning-a-repository)."
+
+For more information about the use of SSH to access repositories on {% data variables.product.product_name %}, see "[Connecting to {% data variables.product.prodname_dotcom %} with SSH](/authentication/connecting-to-github-with-ssh)."
+
+## Contributing to multiple accounts using HTTPS and PATs
+
+Alternatively, if you want to use the HTTPS protocol for both accounts, you can use different personal access tokens (PAT) for each account by configuring Git to store different credentials for each repository.
+
+{% mac %}
+
+{% data reusables.git.open-terminal %}
+{% data reusables.git.confirm-credential-manager %}
+{% data reusables.git.clear-the-stored-credentials %}
+   {% data reusables.git.no-credential-manager %}
+   - If the output is `osxkeychain`, you're using the macOS keychain. To clear the credentials, enter the following command.
+
+     ```shell{:copy}
+     git credential-osxkeychain erase https://github.com
+     ```
+   {% data reusables.git.clear-stored-gcm-credentials %}
+{% data reusables.git.cache-on-repository-path %}
+{% data reusables.accounts.create-personal-access-tokens %}
+{% data reusables.git.provide-credentials %}
+
+{% endmac %}
+
+{% windows %}
+
+1. Open Git Bash.
+{% data reusables.git.confirm-credential-manager %}
+{% data reusables.git.clear-the-stored-credentials %}
+   {% data reusables.git.no-credential-manager %}
+   {% data reusables.git.clear-stored-gcm-credentials %}
+   - If the output is `wincred`, you're using the Windows Credential Manager. To clear the credentials, enter the following command.
+
+     ```shell{:copy}
+     cmdkey /delete:LegacyGeneric:target=git:https://github.com
+     ```
+{% data reusables.git.cache-on-repository-path %}
+{% data reusables.accounts.create-personal-access-tokens %}
+{% data reusables.git.provide-credentials %}
+
+{% endwindows %}
+
+{% linux %}
+
+{% data reusables.git.open-terminal %}
+{% data reusables.git.confirm-credential-manager %}
+{% data reusables.git.clear-the-stored-credentials %}
+   {% data reusables.git.no-credential-manager %}
+   {% data reusables.git.clear-stored-gcm-credentials %}
+{% data reusables.git.cache-on-repository-path %}
+{% data reusables.accounts.create-personal-access-tokens %}
+{% data reusables.git.provide-credentials %}
+
+{% endlinux %}
+
+## Contributing to multiple accounts using SSH and `GIT_SSH_COMMAND`
+
+If you want to use the SSH protocol for both accounts, you can use different SSH keys for each account. For more information about using SSH, see "[Connecting to {% data variables.product.prodname_dotcom %} with SSH](/authentication/connecting-to-github-with-ssh)."
+
+To use a different SSH key for different repositories that you clone to your workstation, you must write a shell wrapper function for Git operations. The function should perform the following steps.
+1. Determine the repository's full name with owner, using a command such as `git config --get remote.origin.url`.
+2. Choose the correct SSH key for authentication.
+3. Modify `GIT_SSH_COMMAND` accordingly. For more information about `GIT_SSH_COMMAND`, see [Environment Variables](https://git-scm.com/docs/git#Documentation/git.txt-codeGITSSHCOMMANDcode) in the Git documentation.
+
+For example, the following command sets the `GIT_SSH_COMMAND` environment variable to specify an SSH command that uses the private key file at **_PATH/TO/KEY/FILE_** for authentication to clone the repository named **_OWNER_**/**_REPOSITORY_** on {% data variables.product.product_location %}.
+
+<pre>
+GIT_SSH_COMMAND='ssh -i <em>PATH/TO/KEY/FILE</em> -o IdentitiesOnly=yes' git clone git@github.com:<em>OWNER</em>/<em>REPOSITORY</em>
+</pre>

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/merging-multiple-personal-accounts.md

@@ -8,12 +8,13 @@ redirect_from:
   - /github/setting-up-and-managing-your-github-user-account/merging-multiple-user-accounts
   - /github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts
   - /account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts
+  - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/merging-multiple-personal-accounts
 versions:
   fpt: '*'
   ghec: '*'
 topics:
   - Accounts
-shortTitle: Merge multiple personal accounts
+shortTitle: Merge multiple accounts
 ---
 {% tip %}
 

content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md

@@ -82,7 +82,11 @@ These restrictions are unacceptable for some enterprises. To determine whether {
 
 ### Do your developers rely on collaboration outside of your enterprise?
 
-{% data variables.product.prodname_managed_users_caps %} can only contribute to repositories within your enterprise. If your developers need to collaborate in repositories outside your enterprise, even private repositories, to complete their work, {% data variables.product.prodname_emus %} may not be right for your enterprise, and SAML SSO may be a better solution.
+{% data variables.product.prodname_managed_users_caps %} can only contribute to repositories within your enterprise. If your developers must contribute to both repositories within and outside of your enterprise, including private repositories, {% data variables.product.prodname_emus %} may not be right for your enterprise. SAML SSO may be a better solution.
+
+Some companies maintain repositories within an existing enterprise using SAML SSO on {% data variables.product.product_location %}, and also create an {% data variables.product.prodname_emu_enterprise %}. Developers who contribute to repositories owned by both enterprises from a single workstation must switch between the accounts on {% data variables.product.product_location %} within a single browser, or use a different browser for each account. The developer may also need to customize the workstation's Git configuration to accommodate the two accounts. The complexity of this workflow can increase the risk of mistakenly leaking internal code to the public.
+
+If you decide to create an {% data variables.product.prodname_emu_enterprise %} but require that developers contribute to resources outside of the enterprise from a single workstation, you can provide support for switching between the accounts in a developer's local Git configuration. For more information, see "[About {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users#supporting-developers-with-multiple-user-accounts-on-githubcom)."
 
 ### Does your enterprise rely on outside collaborators?
 

content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md

@@ -112,6 +112,8 @@ Before your developers can use {% data variables.product.prodname_ghe_cloud %} w
   
 5. Once authentication and provisioning are configured, you can start provisioning members and managing teams. For more information, see "[Managing team memberships with identity provider groups](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups)."
 
+If members of your enterprise must use one workstation to contribute to repositories on {% data variables.product.product_location %} from both a  {% data variables.product.prodname_managed_user %} and a personal account, you can provide support. For more information, see "[Supporting developers with multiple user accounts on {% data variables.product.prodname_dotcom_the_website %}](#supporting-developers-with-multiple-user-accounts-on-githubcom)."
+
 ## Authenticating as a {% data variables.product.prodname_managed_user %}
 
 {% data variables.product.prodname_managed_users_caps %} must authenticate through their identity provider. To authenticate, a {% data variables.product.prodname_managed_user %} can visit their IdP application portal or use the login page on {% data variables.product.prodname_dotcom_the_website %}.
@@ -134,3 +136,9 @@ Before your developers can use {% data variables.product.prodname_ghe_cloud %} w
 A conflict may occur when provisioning users if the unique parts of the identifier provided by your IdP are removed during normalization. If you're unable to provision a user due to a username conflict, you should modify the username provided by your IdP. For more information, see "[Resolving username conflicts](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication#resolving-username-conflicts)."
 
 The profile name and email address of a {% data variables.product.prodname_managed_user %} is also provided by the IdP. {% data variables.product.prodname_managed_users_caps %} cannot change their profile name or email address on {% data variables.product.prodname_dotcom %}, and the IdP can only provide a single email address.
+
+## Supporting developers with multiple user accounts on {% data variables.product.product_location %}
+
+People on your team may need to contribute to resources on {% data variables.product.product_location %} that are outside of your {% data variables.product.prodname_emu_enterprise %}. For example, you may wish to maintain a separate enterprise for your company's open source projects. Because a {% data variables.product.prodname_managed_user %} cannot contribute to public resources, users will need to maintain a separate, personal account for this work.
+
+People who must contribute from two user accounts on {% data variables.product.product_location %} using one workstation can configure Git to simplify the process. For more information, see "[Managing multiple accounts](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/managing-multiple-accounts)."

data/features/multiple-accounts-one-workstation.yml

@@ -0,0 +1,6 @@
+# Issue #7330
+# Documentation for managing multiple GitHub accounts on one workstation
+
+versions:
+  fpt: '*'
+  ghec: '*'

data/reusables/accounts/create-personal-access-tokens.md

@@ -0,0 +1 @@
+1. For each of your accounts, create a dedicated PAT with `repo` scope. For more information, see "[Creating a personal access token](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)."

data/reusables/git/cache-on-repository-path.md

@@ -0,0 +1,5 @@
+1. To configure Git to cache credentials for each local directory where you clone a repository, enter the following command.
+
+   ```shell{:copy}
+   git config --global credential.useHttpPath true
+   ```

data/reusables/git/clear-stored-gcm-credentials.md

@@ -0,0 +1,5 @@
+- If the output is `manager-core`, you're using Git Credential Manager. To clear the credentials, run the following command.
+
+    ```shell{:copy}
+    git credential-manager reject https://github.com
+    ```

data/reusables/git/clear-the-stored-credentials.md

@@ -0,0 +1 @@
+1. If the output confirms that you're using a credential manager, clear the stored credentials for the credential manager.

data/reusables/git/confirm-credential-manager.md

@@ -0,0 +1,5 @@
+1. To confirm your use of a credential manager, enter the following command and note the output.
+
+   ```shell{:copy}
+   git config --get credential.helper
+   ```

data/reusables/git/no-credential-manager.md

@@ -0,0 +1 @@
+- If the output doesn't include the name of a credential manager, there is no credential manager configured, and you can proceed to the next step.

data/reusables/git/open-terminal.md

@@ -0,0 +1 @@
+1. Open Terminal.

data/reusables/git/provide-credentials.md

@@ -0,0 +1,3 @@
+1. The first time that you use Git to clone a repository or access data in a repository that you've already cloned, Git will request credentials. Provide the PAT for the account with access to the repository.
+
+   Git will cache the PAT for the directory you're in, and you'll be able to access and write repository data on {% data variables.product.product_location %} using the correct account.