[英]How to git undo merge for file
in git.在 git 中。 I'm looking for the best aproach to merge master into feature branch, yet, to skip on files [path_to_file_a]/a and [path_to_file_b]/b
我正在寻找将 master 合并到功能分支的最佳方法,但要跳过文件 [path_to_file_a]/a 和 [path_to_file_b]/b
ideas ?想法?
Thx.谢谢。
One approach:一种方法:
git log
# "q" to quit
# note the first commit hash (for HEAD commit), let's call it <hash>
git merge master
git checkout <hash> [path_to_file_a]/a
git checkout <hash> [path_to_file_b]/b
To commit the result:提交结果:
git commit -a
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.