Multiple commits cherry-picking

Question

I have 33 commits in the main branch that are meshed up. Now I need to maintain the record neatly. So now I have created feature branches and I'm trying to classify those 33 commits in different feature branches. So can it be possible to pick multiple commits at a time to copy in the relevant feature branch? And I am also facing its conflicts when I tried multiple commits with the cherry-pick command.

git cherry-pick A B C

here A, B, C are the commits' hashcode.

@silvio: Question is how to pick the multiple commits? The way I am doing is the correct and if yes then how to resolve the cherry-picking conflicts. — Nitu Dhaka, Dec 20 '13 at 07:51
If these 33 commits is consecutive, you can use `git cherry-pick A^..B`. ( A is the first and B is the last ) — pktangyue, Dec 20 '13 at 08:50
Possible duplicate of [How to cherry-pick multiple commits](http://stackoverflow.com/questions/1670970/how-to-cherry-pick-multiple-commits) — Nick Roz, Feb 21 '17 at 13:29
Possible duplicate of [Cherry-Picking few commits from another branch](https://stackoverflow.com/questions/46109211/cherry-picking-few-commits-from-another-branch) — Michael Freidgeim, Aug 21 '19 at 08:16

score 21 · Answer 1 · answered Dec 20 '13 at 08:07

You do it correct. The synopsis is

git cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...

git cherry-pick goes from left to right commit. You can order how you want. If you have a conflict you have three choices. you can git cherry-pick --quit (stop cherry-picking and let your tree in his current state), git cherry-pick --abort (stop cherry-picking and reset your branch to the state where he was before you start git cherry-pick) or resolve this conflict with an editor or with git mergetool and then git cherry-pick --continue go to next commit in your list.

+1 for mentioning `git cherry-pick --continue` for handling conflicts when cherry-picking multiple commits :) — JK ABC, Mar 17 '16 at 06:31

mockinterface · Answer 2 · 2013-12-20T09:48:32.537

6

If you need to maintain the record neatly you are better off with creating a topic branch and running git rebase -i <commit before the 33rd>, an interactive rebase. Follow the instructions for dropping commits. This should be simpler than cherry-picking so many commits in a particular strict order.

edited Dec 20 '13 at 09:48

answered Dec 20 '13 at 09:42

mockinterface

13,017
4
25
45

Ideally interactive rebase should occur in your feature branch, rewriting history in a develop or master branch mush handle with care – Asanka Siriwardena Feb 03 '17 at 10:52
Ideally, store the list the of commits, sort them into the different branches, then load the respective list for the interactive rebase from the file. That way you avoid the situation where you don't know whether a specific commit has already been taken care of. – cmaster - reinstate monica Sep 22 '20 at 09:51

Multiple commits cherry-picking

2 Answers2

Linked