How can I pull down a git and have it overwrite my local project ONLY where conflicts are found?
E.g. I have many folders / files in my local project that are not on the git project and never will be.
Ok... here is the full scenario.
I used DaftMonk generator to create a fullstack boilerplate: https://github.com/DaftMonk/generator-angular-fullstack
I then edited the boilerplate and created my app.
Now, I want to share my code on git, for colleagues to start developing on - BUT, daftmonk generator has added several of its folders to gitignore file (node modules / dist etc). As its not good practice to check these in (Plus, it throws a wobbly since the paths are too long in node modules folder).
So, I am trying to get the code working elsewhere. However, the code in the git needs all the node modules etc to work... So, I have made another install of daftmonk and am now wanting to place my git code on top of this.
Where am I going wrong?