I always create patches to merge some changes from one branch to the other.

I follow the following sequence:

• sync one branch
• select a commit, and create patch
• go to another window that represents the other branch
• select 'apply patch'
• select the patch file (created above)
• the window then says 'invalid patch file)

The same sequence always worked in 2.x