Merging branch after adding submodule
<p>I have just added a git submodule to my master branch. I now want to merge that with my production branch. In my project root, all changes are committed:</p>

<pre><code>git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
</code></pre>

<p>however, if I run <code>git checkout production</code> then I get a whole load of errors e.g. </p>

<pre><code>error: The following untracked working tree files would be overwritten by checkout:
        docs/themes/nativescript/_config.yaml
Please move or remove them before you can switch branches.
Aborting
</code></pre>

<p>These are all the files in my git submodule. How can I do the merge so they are present on my production branch?</p>