{"id":2277,"date":"2021-12-13T17:03:17","date_gmt":"2021-12-13T22:03:17","guid":{"rendered":"https:\/\/openlab.bmcc.cuny.edu\/mmp-350-fall-21\/?p=2277"},"modified":"2021-12-13T17:03:29","modified_gmt":"2021-12-13T22:03:29","slug":"git-cherry-pick","status":"publish","type":"post","link":"https:\/\/openlab.bmcc.cuny.edu\/mmp-350-fall-21\/tools\/git-cherry-pick\/","title":{"rendered":"Git Cherry Pick"},"content":{"rendered":"\n

Cherry picking in git is a relatively advance way to bring in the code from a single commit into your current working branch. <\/p>\n\n\n\n

Why might you want to do this? Well, a good example in our class is that I forgot to add some code to the .eleventy.js file in the eleventy-basic<\/a> repository template I made on GitHub. Many of you created your projects from this. If I update that now, which I did, you won’t get the changes unless you do something like use cherry pick.<\/p>\n\n\n\n

Example: Update eleventy-basic with git cherry-pick<\/h2>\n\n\n\n

Steps to update your file<\/p>\n\n\n\n

  1. Open Visual Studio Code to your project that is based on eleventy-basic.<\/li>
  2. Open the terminal<\/li>
  3. Add my repository as a remote by putting the following in the Terminal:
    1. git remote add stein-repo https:\/\/github.com\/profstein\/eleventy-basic.git<\/strong><\/code><\/li><\/ol><\/li>
    2. Run git fetch to bring down the info on my repo. type in terminal:
      1. git fetch stein-repo<\/strong><\/code><\/li><\/ol><\/li>
      2. Make sure you’re on the right branch. Create a new one if you need to. This way if you mess it up it won’t effect anything else. You can copy below into the terminal to make a new branch.
        1. git checkout -b pick-stein<\/strong><\/code><\/li><\/ol><\/li>
        2. Run the cherry-pick. Again paste in template
          1. git cherry-pick df9e35e<\/code><\/strong><\/code><\/li><\/ol><\/li><\/ol>\n\n\n\n

            You should see a new commit in your history with my comment: “set nunjucks as template lang, install ja-yaml eleventyNavigation”<\/p>\n\n\n\n

            It changes .eleventy.js, package.json and package-lock.json.<\/p>\n\n\n\n

            If everythign worked out then merge this back into main<\/p>\n\n\n\n

            1. git checkout main<\/strong><\/code><\/li>
            2. git merge pick-stein<\/strong><\/code><\/li><\/ol>\n\n\n\n

              You will also need to run npm install as I added some modules you might need as part of this commit.<\/p>\n\n\n\n

              npm install<\/code><\/p>\n\n\n\n

              Here is the process again with just the git commands<\/p>\n\n\n\n

              1. git remote add stein-repo https:\/\/github.com\/profstein\/eleventy-basic.git<\/li>
              2. git fetch stein-repo<\/li>
              3. git checkout -b pick-stein<\/li>
              4. git cherry-pick df9e35e<\/li>
              5. git checkout main<\/li>
              6. git merge pick-stein<\/li>
              7. npm install<\/li><\/ol>\n\n\n\n

                <\/p>\n\n\n\n

                Video Tutorial<\/h2>\n\n\n\n

                Here is a video tutorial I made that talks through the process more generally.<\/p>\n\n\n\n