repo sync

Author: Octomerger

assets/images/help/desktop/cherry-picking.png

@@ -0,0 +1,23 @@
+---
+title: Cherry-picking a commit
+intro: You can pick a specific commit on one branch and copy the commit to another branch.
+versions:
+  free-pro-team: '*'
+---
+
+### About Git cherry-pick
+
+You can cherry-pick a commit on one branch to create a copy of the commit with the same changes on another branch. If you commit changes to the wrong branch or want to make the same changes to another branch, you can cherry-pick the commit to apply the changes to another branch. You can also use cherry-picking to apply specific changes before you are ready to create or merge a pull request. For example, if you commit a bug fix to a feature branch, you can cherry-pick the commit with the bug fix to other branches of your project.
+
+You can also use cherry-picking when collaborating with a team. Some projects incorporate contributions by cherry-picking commits. For more information, see [Distributed Git - Maintaining a Project](https://git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project#_rebase_cherry_pick) in the Git documentation.
+
+### Cherry-picking a commit
+
+{% data reusables.desktop.current-branch-menu %}
+2. In the list of branches, click the branch that has the commit that you want to cherry-pick.
+{% data reusables.desktop.history-tab %}
+4. Drag the commit that you want to cherry-pick to the {% octicon "git-branch" aria-label="The branch icon" %} **Current Branch** menu and drop the commit on the branch that you want to copy the commit to.
+  ![Dragging a commit to another branch in the Current Branch menu](/assets/images/help/desktop/cherry-picking.png)
+
+### Further reading
+- [git-cherry-pick](https://git-scm.com/docs/git-cherry-pick) in the Git documentation

content/desktop/contributing-and-collaborating-using-github-desktop/cherry-picking-a-commit.md

@@ -22,6 +22,7 @@ versions:
     {% link_in_list /stashing-changes %}
     {% link_in_list /pushing-changes-to-github %}
     {% link_in_list /reverting-a-commit %}
+    {% link_in_list /cherry-picking-a-commit %}
     {% link_in_list /managing-tags %}
     {% link_in_list /viewing-the-branch-history %}
 {% topic_link_in_list /working-with-your-remote-repository-on-github-or-github-enterprise %}

content/desktop/contributing-and-collaborating-using-github-desktop/index.md

@@ -91,7 +91,7 @@
     working tree is pointing to a new branch.
 - term: cherry-picking
   description: >-
-    To choose a subset of changes from a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the `git cherry-pick` command to extract the change introduced by an existing commit on another branch and to record it based on the tip of the current branch as a new commit.
+    To choose a subset of changes from a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the `git cherry-pick` command to extract the change introduced by an existing commit on another branch and to record it based on the tip of the current branch as a new commit. For more information, see [git-cherry-pick](https://git-scm.com/docs/git-cherry-pick) in the Git documentation.
 - term: child team
   description: >-
     Within nested teams, the subteam that inherits the parent team's access

data/glossaries/external.yml

@@ -131,6 +131,7 @@ sections:
     - Dependency graph fails to parse `setup.py` Python manifest files, resulting in HTTP 500 errors in logs. This, combined with the duplicated logging issue, results in increased root volume utilization.
     - A race condition can cause dependency graph database migrations to appear to fail.
     - Instances with a custom timezone that were upgraded from an earlier release of GitHub Enterprise Server may have incorrect timestamps in the web UI.
+    - Old builds of Pages are not cleaned up, which could fill up the user disk (`/data/user/`).
 
   deprecations:
     - heading: Deprecation of GitHub Enterprise Server 2.19

data/release-notes/3-0/0.yml

@@ -43,6 +43,7 @@ sections:
     - 'reStructuredText (RST) rendering in the web UI may fail and instead display raw RST markup text.'
     - 'Dependency graph fails to parse `yarn.lock` Javascript manifest files, resulting in HTTP 500 errors in logs.'
     - 'Instances with a custom timezone that were upgraded from an earlier release of GitHub Enterprise Server may have incorrect timestamps in the web UI.'
+    - 'Old builds of Pages are not cleaned up, which could fill up the user disk (`/data/user/`).'
     - |
       Users may experience assets such as avatars not loading, or a failure to push/pull code. This may be caused by a PID mismatch in the `haproxy-cluster-proxy` service. To determine if you have an affected instance:
 

data/release-notes/3-0/1.yml

@@ -29,6 +29,7 @@ sections:
     - When maintenance mode is enabled, some services continue to be listed as "active processes". The services identified are expected to run during maintenance mode. If you experience this issue and are unsure, contact [GitHub Enterprise Support](https://enterprise.githubsupport.com/hc/en-us) or [GitHub Premium Support](https://premium.githubsupport.com/).
     - Jupyter Notebook rendering in the web UI may fail if the notebook includes non-ASCII UTF-8 characters.
     - reStructuredText (RST) rendering in the web UI may fail and instead display raw RST markup text.
+    - Old builds of Pages are not cleaned up, which could fill up the user disk (`/data/user/`).
     - |
       Users may experience assets such as avatars not loading, or a failure to push/pull code. This may be caused by a PID mismatch in the `haproxy-cluster-proxy` service. To determine if you have an affected instance:
 

data/release-notes/3-0/2.yml

@@ -28,6 +28,7 @@ sections:
     - When maintenance mode is enabled, some services continue to be listed as "active processes". The services identified are expected to run during maintenance mode. If you experience this issue and are unsure, contact [GitHub Enterprise Support](https://enterprise.githubsupport.com/hc/en-us) or [GitHub Premium Support](https://premium.githubsupport.com/).
     - Jupyter Notebook rendering in the web UI may fail if the notebook includes non-ASCII UTF-8 characters.
     - reStructuredText (RST) rendering in the web UI may fail and instead display raw RST markup text.
+    - Old builds of Pages are not cleaned up, which could fill up the user disk (`/data/user/`).
     - |
       Log rotation may fail to signal services to transition to new log files, leading to older log files continuing to be used, and eventual root disk space exhaustion.
       To remedy and/or prevent this issue, run the following commands in the [administrative shell](https://docs.github.com/en/enterprise-server/admin/configuration/accessing-the-administrative-shell-ssh) (SSH), or contact [GitHub Enterprise Support](https://enterprise.githubsupport.com/hc/en-us) or [GitHub Premium Support](https://premium.githubsupport.com/) for assistance: