如何克服樱桃挑剔冲突

Question

Is there any method by which we can override the cherry-pick conflicts? My scenario is: If user provides three changeids, and one file is common in all the three changeids. It will result in cherry-pick conflicts. So over-riding means, the script should take that file from the third changeid.

Answer 1

You can write a script/ hook that do it, but keep in mind that in git many commands can get multiple commit ids as valid input.

What if the given parameter is a branch name? you will have to parse it to get the latest commit id if its not the current HEAD

I recommending of writing a script that will do what you asking it to do.