git how to merge just the new changes in a single commit into another branch? -

while working on development branch (newstuff) had situations had branch temporary fix (quickfix) commit 1 behind (master) , push server.

that easy , worked fine, server running quickfix branch.

my question how merge changes (newstuff + quickfix) master, without running merge conflict.

not sure if should cherry-pick, or merge, , in order.

the quickfix changes handful of lines have not been altered current (master) or current (newstuff) branches, actual changes in quickfix not cause merge conflict.

a picture helps: git repo looks (aaaaa common ancestor)

aaaaa bbbbb --> xxxxx <== quickfix ccccc  <== master ddddd eeeee fffff ggggg  <== newstuff 

just merge them in order

# v1 $ git checkout master $ git merge quickfix $ git merge newstuff  # v2 $ git checkout master $ git merge newstuff $ git merge quickfix