git merge andrei/cmr-v6 --no-commit --no-ff saves the day

Using git merge --no-commit --no-ff to stage selective changes across branches