1.切换到当前分支(即:要合并文件到的分支)
git checkout current_branch
2.合并指定分支上的文件到当前分支
git checkout --patch zhiding_branch f.txt
合并zhiding_branch分支上的f.txt文件到current_branch
GitHub地址:https://github.com/mingyang66/spring-parent/tree/master/doc/git
git checkout current_branch
git checkout --patch zhiding_branch f.txt
合并zhiding_branch分支上的f.txt文件到current_branch
GitHub地址:https://github.com/mingyang66/spring-parent/tree/master/doc/git