将不同分支的提交挑选到主分支

Question

I have 3 branches:
- master
- feature1
- feature2

Feature1 & Feature2 have common code which is independent and has several commits, How do i pick individual commits from f1 and f2 into master?

Answer 1

You can use git cherry-pick . For example, if you wanted to copy a commit from feature1 whose hash was a43kbjhl to master , you could do the following:

git checkout master
git cherry-pick a43kbjhl

And you can repeat the above step for all the commits you want to cherry pick. Keep in mind that if you actual inspect the commits you have copied over, their SHA-1 hashes actually won't match the originals. This is because Git has created new commits for each cherry-pick.