$ git merge feature/tickets/NUTS-1231 --no-commit --no-ff

Sometimes you need to merge but only parcial files and you want fine control over everything and and possibly want to manually merge parts of files. This is when I use –no-commit –no-ff, ff for fast forward, it basically stages the entire merge making it easy to go trough and make changes. Using magit in spacemacs I go through hitting ‘u’ on files I don’t want unstaging them, then maybe ’e’ on a file to edit it via ediff, combining the new changes with orginal file seamlessy. Overall a fun and impowering workflow!

source:

stackoverflow