diff --git a/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md b/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md index 2d3568b844..d37e1725b4 100644 --- a/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md +++ b/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md @@ -19,9 +19,9 @@ The lifecycle of a codespace begins when you create a codespace and ends when yo When you want to work on a project, you can choose to create a new codespace or open an existing codespace. You might want to create a new codespace from a branch of your project each time you develop in {% data variables.product.prodname_codespaces %} or keep a long-running codespace for a feature. For more information, see "[Creating a codespace](/codespaces/developing-in-codespaces/creating-a-codespace)." -If you choose to create a new codespace each time you work on a project, you should regularly push your changes so that any new commits are on {% data variables.product.prodname_dotcom %}. {% data reusables.codespaces.max-number-codespaces %} For more information, see "[Deleting a codespace](/codespaces/developing-in-codespaces/deleting-a-codespace)." +{% data reusables.codespaces.max-number-codespaces %} Similarly, if you reach the maximum number of active codespaces and you try to start another, you are prompted to stop one of your active codespaces. -If you choose to use a long-running codespace for your project, you should pull from your repository's default branch each time you start working in your codespace so that your environment has the latest commits. This workflow is very similar to if you were working with a project on your local machine. +If you choose to create a new codespace each time you work on a project, you should regularly push your changes so that any new commits are on {% data variables.product.prodname_dotcom %}. If you choose to use a long-running codespace for your project, you should pull from your repository's default branch each time you start working in your codespace so that your environment has the latest commits. This workflow is very similar to if you were working with a project on your local machine. {% data reusables.codespaces.prebuilds-crossreference %} diff --git a/content/codespaces/getting-started/deep-dive.md b/content/codespaces/getting-started/deep-dive.md index 16f5e6ca74..424e817ef9 100644 --- a/content/codespaces/getting-started/deep-dive.md +++ b/content/codespaces/getting-started/deep-dive.md @@ -98,7 +98,9 @@ Git is available by default in your codespace and so you can rely on your existi ![Running git status in Codespaces Terminal](/assets/images/help/codespaces/git-status.png) -You can create a codespace from any branch, commit, or pull request in your project, or you can switch to a new or existing branch from within your active codespace. Because {% data variables.product.prodname_github_codespaces %} is designed to be ephemeral, you can use it as an isolated environment to experiment, check a teammate's pull request, or fix merge conflicts. You can create more than one codespace per repository or even per branch. However, each personal account has a limit of 10 codespaces. If you've reached the limit and want to create a new codespace, you must delete a codespace first. +You can create a codespace from any branch, commit, or pull request in your project, or you can switch to a new or existing branch from within your active codespace. Because {% data variables.product.prodname_github_codespaces %} is designed to be ephemeral, you can use it as an isolated environment to experiment, check a teammate's pull request, or fix merge conflicts. + +You can create more than one codespace per repository or even per branch. However, there are limits to the number of codespaces you can create, and the number of codespaces you can run at the same time. If you reach the maximum number of codespaces and try to create another, a message is displayed telling you that you must remove an existing codespace before you can create a new one. {% note %} diff --git a/data/reusables/codespaces/max-number-codespaces.md b/data/reusables/codespaces/max-number-codespaces.md index 2fa6fc6cca..b27ccb65bc 100644 --- a/data/reusables/codespaces/max-number-codespaces.md +++ b/data/reusables/codespaces/max-number-codespaces.md @@ -1 +1 @@ -You can have up to 10 codespaces at a time. Once you have 10 codespaces, you must delete a codespace before you can create a new one. \ No newline at end of file +There are limits to the number of codespaces you can create, and the number of codespaces you can run at the same time. These limits vary based on a number of factors. If you reach the maximum number of codespaces and try to create another, a message is displayed telling you that you must remove an existing codespace before you can create a new one. \ No newline at end of file