This is how I created a patch with the diffs I wanted to apply:

git diff HEAD branch-whose-changes-i-want-to-aply > /tmp/diff.patch

And here is how to apply;

git apply /tmp/patch.diff

Resolving conflicts:

If it fails, you can run:

git am -3 < /tmp/patch.diff

Source here.