Git merge just a few files
Taking almost all of this content from How to selectively merge or pick changes from another branch in git? [stackoverflow.com]
git merge --no-ff --no-commit usefulbranch
By issuing no-commit, you can make any modifications to the code before committing, including:
git checkout HEAD filetostaythesame.txt
Fetching the original (probably master) file that should stay the same.
Comments