Adds state tracking so I know what commit this came from
Example of the problem I'm having

Running
git merge --squash -s subtree --no-commit master

gives me conflict.