When two branches are merged and if there is conflict, after the conflict is resolved and committed, the change of this conflict resolution is recorded in the merge commit, as can be seen by git show
. Now I need to cherry-pick just this conflict resolution, not the merge itself (which can be achieved by git cherry-pick -m
). Is it possible?
The reason why I need to do this is, besides the diff in this merge commit, I also need to cherry-pick other commits, which depend on the change of this merge commit. If I don't cherry-pick the merge commit first, then subsequent cherry-picks will fail.