diff --git a/assets/images/help/codespaces/export-changes-to-a-branch.png b/assets/images/help/codespaces/export-changes-to-a-branch.png new file mode 100644 index 0000000000..17033be0a5 Binary files /dev/null and b/assets/images/help/codespaces/export-changes-to-a-branch.png differ diff --git a/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md b/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md index c6d06944bf..e34e8a994e 100644 --- a/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md +++ b/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md @@ -43,6 +43,8 @@ If you purchased {% data variables.product.prodname_enterprise %} through a Micr For information on managing and changing your account's spending limit, see "[Managing your spending limit for {% data variables.product.prodname_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces)." +{% data reusables.codespaces.exporting-changes %} + ## How billing is handled for forked repositories {% data variables.product.prodname_codespaces %} can only be used in organizations where a billable owner has been defined. To incur charges to the organization, the user must be a member or collaborator, otherwise they cannot create a codespace. diff --git a/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md b/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md index ac3f5700e0..3905aeabde 100644 --- a/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md +++ b/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md @@ -46,5 +46,8 @@ Enterprise owners and billing managers can manage the spending limit for {% data {% data reusables.dotcom_billing.monthly-spending-limit %} {% data reusables.dotcom_billing.update-spending-limit %} +## Exporting changes when you have reached your spending limit + +{% data reusables.codespaces.exporting-changes %} ## Managing usage and spending limit email notifications {% data reusables.billing.email-notifications %} diff --git a/content/codespaces/codespaces-reference/understanding-billing-for-codespaces.md b/content/codespaces/codespaces-reference/understanding-billing-for-codespaces.md index 719bb0e5c1..bfe2caa704 100644 --- a/content/codespaces/codespaces-reference/understanding-billing-for-codespaces.md +++ b/content/codespaces/codespaces-reference/understanding-billing-for-codespaces.md @@ -23,9 +23,9 @@ This article explains how billing works for your codespaces, and explains how yo Your organization's administrator might limit {% data variables.product.prodname_codespaces %} usage to only specific user accounts. To get access, you will need to contact your billing manager. For more information, see "[Managing access and security for your codespaces](/codespaces/managing-your-codespaces/managing-access-and-security-for-your-codespaces)." -## How spending limits work +## How much it costs to use {% data variables.product.prodname_codespaces %} -Before your organization can use {% data variables.product.prodname_codespaces %}, your billing manager will need to set a spending limit. For more information, see "[Managing billing for Codespaces in your organization](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces)." +To see the pricing for {% data variables.product.prodname_codespaces %} usage, see "[{% data variables.product.prodname_codespaces %} pricing](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces#codespaces-pricing)." ## How your codespace usage is billed @@ -37,9 +37,13 @@ Your codespace is billed for the number of minutes that it's active. If your cod ### Understanding how codespace storage is billed For {% data variables.product.prodname_codespaces %}, storage is defined to include any files relating to your codespace, such as the cloned repository, configuration files, and extensions, among others. This storage is billed while your codespace is shutdown. The storage billing for a codespace ends when you manually delete it from https://github.com/codespaces. -## How much it costs to use {% data variables.product.prodname_codespaces %} +## How spending limits work -To see the pricing for {% data variables.product.prodname_codespaces %} usage, see "[{% data variables.product.prodname_codespaces %} pricing](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces#codespaces-pricing)." +Before your organization can use {% data variables.product.prodname_codespaces %}, your billing manager will need to set a spending limit. For more information, see "[Managing spending limits for {% data variables.product.prodname_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces)." + +## Exporting changes when you have reached your spending limit + +{% data reusables.codespaces.exporting-changes %} ## Checking your current usage and limits If you need to check your current usage or spending limit, contact your organization's billing manager. For more information, see "[Viewing your Codespaces usage](/billing/managing-billing-for-github-codespaces/viewing-your-codespaces-usage)." diff --git a/content/codespaces/troubleshooting/exporting-changes-to-a-branch.md b/content/codespaces/troubleshooting/exporting-changes-to-a-branch.md new file mode 100644 index 0000000000..373ab1ee79 --- /dev/null +++ b/content/codespaces/troubleshooting/exporting-changes-to-a-branch.md @@ -0,0 +1,27 @@ +--- +title: Exporting changes to a branch +intro: 'This article provides steps for exporting your codespace changes to a branch.' +product: '{% data reusables.gated-features.codespaces %}' +versions: + fpt: '*' +type: reference +topics: + - Codespaces +shortTitle: Exporting changes +--- + +## Exporting changes to a branch + +While using {% data variables.product.prodname_codespaces %}, you may want to export your changes to a branch without launching a your codespace. + +This can be useful when you have hit a [spending limit](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces) or have a general issue accessing your codespace. + +To export your changes: + +1. Browse to the "Your Codespaces" page at [github.com/codespaces](https://github.com/codespaces) or, for an individual repository, click the **{% octicon "code" aria-label="The code icon" %} Code** menu. +2. Click the ellipsis (**...**) to the right of the codespace you want to export from. +3. Select **{% octicon "git-branch" aria-label="The git branch icon" %} Export changes to branch**. + + ![Export changes to a branch](/assets/images/help/codespaces/export-changes-to-a-branch.png) + +4. From the popover, select **Create branch**. \ No newline at end of file diff --git a/content/codespaces/troubleshooting/index.md b/content/codespaces/troubleshooting/index.md index b9e1a031d8..128c76ae95 100644 --- a/content/codespaces/troubleshooting/index.md +++ b/content/codespaces/troubleshooting/index.md @@ -11,12 +11,13 @@ redirect_from: - /github/developing-online-with-codespaces/troubleshooting-your-codespace - /codespaces/working-with-your-codespace/troubleshooting-your-codespace children: + - /codespaces-logs + - /exporting-changes-to-a-branch - /troubleshooting-creation-and-deletion-of-codespaces - /troubleshooting-your-connection-to-codespaces - /troubleshooting-dotfiles-for-codespaces - /troubleshooting-port-forwarding-for-codespaces - /troubleshooting-codespaces-clients - - /codespaces-logs - /working-with-support-for-codespaces --- diff --git a/data/reusables/codespaces/exporting-changes.md b/data/reusables/codespaces/exporting-changes.md new file mode 100644 index 0000000000..c4c642faee --- /dev/null +++ b/data/reusables/codespaces/exporting-changes.md @@ -0,0 +1 @@ +If you hit a spending limit, you will no longer be able to create or resume your codespaces. You can still [export any work in progress changes to a new branch](/codespaces/troubleshooting/exporting-changes-to-a-branch). \ No newline at end of file