Git Cherry-Pick and Conflicts

Question

There are two different git branches. In one the development is going in (Branch1).

In other branch some PoC work is going on (Branch2). Now, I want to cherry-pick the changes from Branch1 to Branch2, so that Branch2 is up to date.

Now, after cherry-picking 4 or 5 changes, I am getting some merge conflict and I am unable to proceed with further cherry-picks.

Do, I need to resolve all the conflicts before proceeding to next cherry -pick or Can I somehow postpone the conflict resolution till I cherry-pick all the changes (and resolve all conflicts together)?

Further, is it suggested to do cherry-pick or branch merge in this case?

Answer 1

Before proceeding:

• Install a proper mergetool. On Linux, I strongly suggest you to use meld:

  sudo apt-get install meld
  

• Configure your mergetool:

  git config --global merge.tool meld
  

Then, iterate in the following way:

git cherry-pick ....
git mergetool
git cherry-pick --continue