How to merge a specific commit in Git

When you want to merge specific commits in Git, you can use the git cherry-pick command. This command allows you to select one or more specific commits and apply them to your current branch. Below are the steps to use git cherry-pick for merging specific commits:

Step 1: Determine the Commit Hash

First, find the hash value of the commit you want to merge. You can view the commit history using the git log command:

bash
git log --oneline

This lists all commits, each with a short hash and commit message.

Step 2: Use git cherry-pick

Once you have the commit hash, apply it to your current branch with the following command:

bash
git cherry-pick <commit-hash>

Here, <commit-hash> is the hash value obtained in Step 1.

Example

Suppose there is a commit with hash abc1234 that fixes an important bug. If you are working on the develop branch and need to merge this fix, you can do so by:

bash
git checkout develop
git cherry-pick abc1234

This applies the commit abc1234 to the develop branch.

Notes

• Conflict Resolution: When using git cherry-pick, conflicts may occur. Resolve them manually and continue the cherry-pick operation.

• Multiple Commits: To merge multiple commits, list all relevant hash values in one command:

  bash
  

git cherry-pick commit1 commit2 commit3

shell

- **Range Specification**: For consecutive commits, use the following syntax:

  ```bash
git cherry-pick commit1^..commit3

This cherry-picks all commits from commit1 to commit3.

By using this method, you can flexibly merge specific commits between branches without merging all changes of the entire branch, which is especially useful for large projects.