Home / Questions / 99044
Accepted
Jorius
Asked: 2020-09-01 14:40:24 +0800 CST 2020-09-01 14:40:24 +0800 CST

How to merge specific commits

  • 772

I have a project called Proyectwhich has three ( 3 ) branches:

  1. master( M )
  2. sdev( S )
  3. test( T )

Which at the moment are like this:

initial commit
↓   
↓   
↓      merge test into master
↓      checkout -b sdev master
↓      ↓ 
↓      ↓

M------*------------------------------* # HEAD
\     / \ 
 \   /   \
  \ /     \
   T-------\--------\--------------*    # commits behind master
            \        \
             \        \
              S-*--*---*---------*      # commits behind test behind master

                ↑  ↑   ↑
                ↑  ↑   ↑         
                ↑  ↑   ↑
                ↑  ↑   merge test into sdev           
                ↑  ↑ 
                ↑  ↑
                ↑  commit 2 que quiero pushear directamente a master
                ↑
                ↑
                commit 1 que quiero pushear directamente a master

What I want to do and I don't know is to perform a mergespecific del commit 1and commit 2branch sdevdirectly to the branch masterwithout affecting anything in the commitssubsequent branches sdevand test, that is, I would like something like this:

M------*------------------------------*-*--* # HEAD
\     / \             ________________↑ ↑
 \   /   \           / _________________↑
  \ /     \         / /
   T-------\-------*-*------------------*    # commits behind master
            \     / / 
             \   / /      
              S-*--*---*--------------*      # commits behind test behind master
git

1 Answers

  1. Best Answer

    I simply had to make use of git cherry-pick

    First : I moved to the branch sdevwith a simplegit checkout sdev

    Second : I looked up the unique identifiers SHA-1of the branch commits sdevwith a simple:
    git log --pretty=oneline, which gave me:

    <SHA-1> (origin/sdev) commit 1
<SHA-1> (origin/sdev) commit 2

    Third : I went back to the branch master(which is where I wanted to perform the merge)
    Fourth : Then I proceeded to perform the cherry-pick 

    git cherry-pick <SHA-1>

    Everything OK, without any problems and/or conflicts

    git cherry-pick <SHA-1>

    Here I was presented with a conflict in several files
    I solved it manually and proceeded with

    git cherry-pick --continue

    The cherry-pick can be canceled by adding the option--abort

    • 8