I have a MEAN stack project separated into two branches: Ionic and Node.
The Ionic branch
have all Ionic
related files/folder. The front-end
is created here to serve mobiles and web devices. But the code for web devices from this branch is not hosted anywhere.
The Node branch
have server
related files/folder. This branch will be uploaded to host the application end-points and will need to serve a public front-end folder. The front-end folder comes from the Ionic branch.
I've read this post about spliting a commit into separate commits, so we can ignore one of them. This don't solve the problem because I have lots of files and folders that should not merge and would be very hard to separate them all in each and every merge. I need only the front-end/public/www
folder to merge into the Node branch.
I also read about this, this, this and a lot more relevant questions on Stack and articles on the internet, but none of them could address my issue.
We have a Node and an Ionic branch. The Node branch need to have only specific files and folders from the Ionic branch. How can we do that?
Appendixes
Branch Node example:
¬ node_modules
¬ routes
¬ www
¬ files/etc
Ionic Node example:
¬ node_modules //this should not merge into Node
¬ hooks //this should not merge into Node
¬ resources //this should not merge into Node
¬ www //MERGE THIS
¬ files/etc //some should merge, some should not.