while doing cherry-pick of commits from branch development to master there is cherry-pick conflicts caused by missing commits in master (the order of commits matters). So, I compare the log of commits in the two branches and I cherry-pick the missing ones. this process is painful, especially when done on multiple commits. Is there a git command or script to show the dependant commits that need to be cherry-picked before the one.
Asked
Active
Viewed 53 times
0
-
https://git-scm.com/docs/git-cherry – phd Dec 27 '20 at 22:47
-
@phd i don't think you understand my concern – aymen0406 Dec 28 '20 at 15:58
-
2I'm sure I do. The command `git cherry` shows the list of missing commits. – phd Dec 28 '20 at 16:10