rotimi-best

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

1. git checkout prod - Go to the branch with the oldest changes
2. git merge --no-commit --no-ff master - Merge with the branch with the latest changes. Read More
3. git reset -- client* - Unstage any changes from client folder, I only want to server folder. Read More
4. git checkout -- client* - Remove any changes from client folder, I only want to server folder.
5. git clean -n - View all unstaged files. Read More
6. git clean -fd - Remove all unstaged folder, if you dont want to remove all then you should add those with git add and then run this command. Read More