Yes, for one file during the merge you can:
git checkout good_revision file
题
In magit during a manual merge, sometimes there are files with many changes and I want to accept either all my changes, or all the changes in the other branch, rather than select them one by one. Is there a way to do that within magit, or if not from the git command line?
解决方案
Yes, for one file during the merge you can:
git checkout good_revision file