royswale/merge.md

git - How to merge one folder within two branches

In my project folder I have 2 folders client and server, I only want get the changes in my server folder from master to prod branch

git checkout prod - Go to the branch with the oldest changes
git merge --no-commit --no-ff master - Merge with the branch with the latest changes. Read More
git reset -- client* - Unstage any changes from client folder, I only want to server folder. Read More
git checkout -- client* - Remove any changes from client folder, I only want to server folder.
git clean -n - View all unstaged files. Read More
git clean -fd - Remove all unstaged folder, if you dont want to remove all then you should add those with git add <path> and then run this command. Read More
Check if you have the required changes in the prod branch
git add . && git commit -m "Merge master with prod" - Stage and commit your changes in the prod branch

The inspiration for this task came from an issue I had and this article helped think in the right direction