How to merge changes from one branch to another after pushing to remote

Question

I am new to git. I have a scenario were I have two branches master and testbranch as

Master <--M1 <--- M2 <-- M3

TestBranch...............M3 <-- T1 

New Master:

Master <--M1 <--- M2 <-- M3 <-- T1

I pushed the changes from the testbranch to the remote, now I want to merge my changes in testbranch to master branch. How can I do that?

Answer 1

I was able to resolve this by using cherry-picking.

$ git checkout master
$ git cherry-pick <commit-id>