从git中的合并提交对特定文件应用差异

Question

I am doing a rebase that includes a merge conflict that I already resolved in a merge commit in another branch. Is there a way to apply that resolution on the respective file from the merge commit? Basically, given a merge commit, I want to apply the diff of the +'s and -'s from the second column over a specific file. I hope that makes sense.

Answer 1

It's a little late now, but using git rerere can make this much easier if it comes up a lot.

At this point, what I would try first is a git cherry-pick -n -m [1 or 2] [merge commit SHA1] , then only commit the changes to the one file (by resetting the other ones or whatever), then do your rebase.