[Guide] How to merge commits into a branch using Git Cherry Pick

wrapper

Merging commits from one Git branch to another procedure

Install a mergetool. On Linux, 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

To stop a merge:

git cherry-pick --abort

Example commits merge : Feathercoin 0.9.6.2 mergeTest cherry pick commit :

https://github.com/FeatherCoin/Feathercoin/pull/201/commits/0ba808af8a10c8231490088932baa2d6ae0c7106
Added man pages for feathercoin, modified icons

commit 0ba808af8a10c8231490088932baa2d6ae0c7106 @wellenreiter01

wellenreiter01 committed on 1 Nov 2015

git cherry-pick 0ba808af8a10c8231490088932baa2d6ae0c7106

  error: cherry-pick is not possible because you have unmerged files.
  hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  hint: as appropriate to mark resolution and make a commit.
  fatal: cherry-pick failed    


git mergetool
Merging:
contrib/debian/manpages/feathercoin.conf.5
contrib/debian/manpages/feathercoind.1
contrib/debian/manpages/feathercoin-qt.1

Deleted merge conflict for 'contrib/debian/manpages/feathercoin.conf.5':
  {local}: deleted
  {remote}: created file
Use (c)reated or (d)eleted file, or (a)bort?