{"id":3203,"date":"2024-04-17T22:58:39","date_gmt":"2024-04-17T20:58:39","guid":{"rendered":"https:\/\/nguenkam.com\/blog\/?p=3203"},"modified":"2024-10-21T10:05:02","modified_gmt":"2024-10-21T08:05:02","slug":"git-cherry-pick-what-it-is-and-how-to-use-it","status":"publish","type":"post","link":"https:\/\/nguenkam.com\/blog\/index.php\/2024\/04\/17\/git-cherry-pick-what-it-is-and-how-to-use-it\/","title":{"rendered":"git cherry-pick : what it is and how to use it"},"content":{"rendered":"\n

This command basically allows us to copy a single commit from one branch to another.<\/p>\n\n\n\n

It’s very useful when we need to add a specific change from a commit without merging the entire branch, for example.<\/p>\n\n\n\n

Contrast this with the way commit integration normally<\/em> works in Git: when performing a Merge or Rebase, all commits<\/strong> from one branch are integrated.<\/p>\n\n\n\n

\"\"<\/figure><\/div>\n\n\n\n

Cherry-pick, on the other hand, allows us to select individual<\/strong> commits for integration. In this example, only C2 is integrated into the master branch, but not C4.<\/p>\n\n\n\n

\"\"<\/figure><\/div>\n\n\n\n

How to use the git cherry-pick command?<\/h4>\n\n\n\n

In its most basic form, we only need to provide the SHA identifier of the commit we want to integrate into our current HEAD branch:<\/p>\n\n\n\n

$ git cherry-pick af01e0c<\/code><\/pre>\n\n\n\n
This way, the specified revision will directly be committed to our currently checked-out branch. If we would like to make some further modifications, we can also instruct Git to only add the commit’s changes<\/strong> to our Working Copy – without directly committing them:<\/p>\n\n\n\n
$ git cherry-pick af01e0c --no-commit<\/code><\/pre>\n\n\n\n
<\/div>\n\n\n\n
Example: <\/h4>\n\n\n\n
To use the git cherry-pick<\/code> command to copy a commit from branch B to branch A, follow these steps:<\/p>\n\n\n\n
  1. Switch to Branch A<\/strong>:
    First, ensure you’re on the branch where you want to apply the commit (Branch A).<\/li><\/ol>\n\n\n\n
       git checkout A<\/code><\/pre>\n\n\n\n
    1. Identify the Commit<\/strong>:
      Find the commit hash from Branch B that you want to cherry-pick. You can do this by checking the log:<\/li><\/ol>\n\n\n\n
         git log B<\/code><\/pre>\n\n\n\n
      1. Cherry-Pick the Commit<\/strong>:
        Once you have the commit hash (let’s say it’s abc1234<\/code>), run:<\/li><\/ol>\n\n\n\n
           git cherry-pick abc1234<\/code><\/pre>\n\n\n\n
        1. Resolve Conflicts (if any)<\/strong>:
          If there are conflicts, Git will notify you. You need to resolve these conflicts manually in your files. After resolving, stage the changes:<\/li><\/ol>\n\n\n\n
             git add <file_with_conflicts><\/code><\/pre>\n\n\n\n
          Then, complete the cherry-pick:<\/p>\n\n\n\n
             git cherry-pick --continue<\/code><\/pre>\n\n\n\n
          1. Verify the Commit<\/strong>:
            Check your branch A to ensure the commit has been applied:<\/li><\/ol>\n\n\n\n
               git log<\/code><\/pre>\n\n\n\n
            Summary:<\/h4>\n\n\n\n
            • Switch to Branch A.<\/li>
            • Find the commit hash in Branch B.<\/li>
            • Use git cherry-pick <commit-hash><\/code> to copy it.<\/li>
            • Resolve any conflicts if they arise.<\/li><\/ul>\n\n\n\n
              This method allows us to selectively apply commits from one branch to another without merging the entire branch.<\/p>\n","protected":false},"excerpt":{"rendered":"
              This command basically allows us to copy a single commit from one branch to another. It’s very useful when we need to add a specific change from a commit without merging the entire branch, for example. Contrast this with the way commit integration normally works in Git: when performing a Merge or Rebase, all commits from one branch are […]<\/p>\n","protected":false},"author":1,"featured_media":807,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[60],"tags":[62,459,458,495,494],"_links":{"self":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts\/3203"}],"collection":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/comments?post=3203"}],"version-history":[{"count":3,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts\/3203\/revisions"}],"predecessor-version":[{"id":3494,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts\/3203\/revisions\/3494"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/media\/807"}],"wp:attachment":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/media?parent=3203"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/categories?post=3203"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/tags?post=3203"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}