Code

Use merge-recursive in git-checkout -m (branch switching)