git-15_分支之间merge

First merge to private branch

$git fetch –a   #first get all latest config in repository
$git branch –t core_llv origin/core_llv #create local branch 
$git checkout core_llv
$git merge origin/master    # merge master branch, it’s better to do this under vnc for fix merge conflict.
$git mergetool # when encounter merge issue.
$git commit   # after fix merge issue.
# do compile and verification, and fix
  $git push     #push code to remote core_llv branch 
  
     Then merge to master
     
    $git fetch -a
    $git branch –t master origin/master
    $git checkout master
    $git merge origin/core_llv
    $git push #normally no merge conflic here.

Merge in a MR branch in the dev with only one commit?

stand in a branch following origin/comsa_dev
#git merge --squash origin/comsa_dev_mr27359

Pick one commit from one branch and commit it in another without merge

# git rev-parse --verify HEAD
e9e5553c04f0efdd3d46f97f7beecee92f4192b5

go to the branch where you want to add this commit
# git cherry-pick e9e5553c04f0efdd3d46f97f7beecee92f4192b5