赞
踩
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