# Move on the branch to which you want to "add" commits
git checkout dev
# Cherry-pick a single commit
git cherry-pick <hash>
# Cherry-pick multiple commits
git cherry-pick <hash> <hash> <hash>
# Cherry-pick a range of commits, both ends included
git cherry-pick <hash>^...<hash>
# in case there is a conflict, resolve it and then:
git add <file_to_merge>
git commit
git cherry-pick --continue
# In case you want to undo the cherry-picking:
git cherry-pick --abort