Skip to main content

Github cherry picking

What is cherry picking ?
Cherry picking is plucking selective code to push to another branch. Sometime team is working on several modules and there is urgency to fix some production issue and deploy it.

We can have two ways of doing it
1. Create a separate branch from master (production branch) , for example name it as "branch1" and fix the bug and merge that branch into master back.

2. Fix the bug in existing branch and cherry pick it in master branch. This way only selective changes would be pushed to master and not all code.

Whenever we push some code in git, it creates a unique commit id.
For example:


Unique commit id looks like shown in green box



Copy that commit id which you want to cherry pick.
Git checkout to master branch (where you want to cherry pick)

$ command: git checkout master

Cherry pick the selected commit by passing commit id.

$ git cherry-pick b38adf46f21c963b6e85a804ef3942ad8d0b4e4d

Selected commit will be merged into master
Now you can check the status and push the code respectively.

Note: Cherry pick should be incremental and sequence wise. First commit should be cherry picked first followed by second and so on. 

Have a great day ahead !!

Comments

  1. dagneygaboriaultNovember 8, 2022 at 8:46 PM

    If the pc program corrects you a few of} instances, you’ll study the best method to play. I like truth that|the reality that} I can examine at home until I can get fairly good. When you make a 1xbet web-based casino deposit, find a way to|you presumably can} benefit of|benefit from|reap the advantages of} welcome bonuses and different deposit promos. These offers normally double your bankroll and at all times have extra reasonable terms. This choice is best for gamblers that want to win actual money taking part in} video poker online.

    ReplyDelete

Post a Comment

Popular posts from this blog

AJAX Progrraming

Ajax , shorthand for Asynchronous JavaScript and XML , is a web development technique for creating interactive web applications. The intent is to make web pages feel more responsive by exchanging small amounts of data with the server behind the scenes, so that the entire web page does not have to be reloaded each time the user requests a change. This is meant to increase the web page's interactivity, speed, and usability. The Ajax technique uses a combination of: XHTML (or HTML) and CSS, for marking up and styling information. The DOM accessed with a client-side scripting language, especially JavaScript and JScript, to dynamically display and interact with the information presented. The XMLHttpRequest object is used to exchange data asynchronously with the web server. In some Ajax frameworks and in certain situations, an IFrame object is used instead of the XMLHttpRequest object to exchange data with the web server, and in other implementations, dynamically added tags may be used. ...
131 comments
Read more

Nutch crawler and integration with Solr

Before moving ahead with this article, I assume you have Solr installed and running. If you would like to install Solr on windows, mac or via docker, please read Setup a Solr instance . There are several ways to install nutch which you can read from Nutch tutorial , however I have written this article for those who would like to install nutch using docker. I tried finding help on google but could not find any help for nutch installation using docker and spent good amount of time fixing issues specific to it. Therefore I have written this article to help and save time of other developers. Install nutch using docker- 1. Pull docker image of nutch using below command,      > docker pull apache/nutch 2. Once image is pulled, run the container,      > docker run -t -i -d --name nutchcontainer apache/nutch /bin/bash 3. You should be able to enter in the container and see bash prompt,      > bash-5.1#  Let's setup few important setting...
3 comments
Read more

Could not load file or assembly 'Microsoft.Web.Infrastructure'

Could not load file or assembly 'Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' or one of its dependencies. The system cannot find the file specified. What 'Micorosoft.Web.Infrastructure' does? This dll lets HTTP modules register at run time. Solution to above problem: Copy 'Micorosoft.Web.Infrastructure' dll in bin folder of your project and this problem should be resolved. If you have .Net framework installed on machine, this dll should be present on it. You can search for this dll and copy it in your active project folder.   Alternatively,  you can install this dll using nuget package manager PM> Install-Package Microsoft.Web.Infrastructure -Version 1.0.0 Happy coding!!
6 comments
Read more