instead of just switching to the base branch and merging it should

• switch to the base branch
• pull latest changes
• switch back
• merge base branch into the current one
• switch to the base branch, merge, etc. as it is now