Merges a commit on the a branch onto the B branch. Actual problem: Merge the modifications of the vendor branch COMMIT:37213CF onto the develop_4.4 branch. [Email protected]:~/amlogic_4.4/amlogics802$
git checkout develop_4.4[Email protected]:~/amlogic_4.4/amlogics802$
git cherry-pick 37213cfA. If the git addgit commit-m "" B. If there is a conflict, manually resolve the [email protected]:~/amlogic_4.4/amlogics802$
git status[Email protected]:~/amlogic_4.4/amlogics802$
git add[Email protected]:~/amlogic_4.4/amlogics802$
git commit-m ""
# on Branch develop_4.4
# Changes to be committed:
#
# Modified:common/drivers/amlogic/amports/m8/ucode/encoder/h264_enc_mix_dump.h
# modified:common/drivers/amlogic/amports/m8/ucode/encoder/h264_enc_mix_dump_dblk.h
# modified:common/drivers/amlogic/amports/m8/ucode/encoder/h264_enc_mix_sw.h
# modified:common/drivers/amlogic/amports/m8/ucode/encoder/h264_enc_mix_sw_hdec_dblk.h
# modified:common/drivers/amlogic/amports/m8/ucode/encoder/h264_enc_mix_sw_vdec2_dblk.h
# modified:packages/amlogic/libplayer/amplayer/player/player.c
#
# unmerged paths:
# (use "Git add/rm <file> ..." as appropriate to mark resolution)
#
# both modified:packages/amlogic/libplayer/amadec/adec-ffmpeg-mgt.c
Git Cherry-pick