How to make a cherry pick?

Question

git

This is the first time I've encountered Cherry Peak.

There are two branches:
1 - A - New branch, with new changes;
2 - B - Previous branch;

I need to throw changes from branch 2(B) into branch 1(A). What I do:

1) Go to the 2(B) branch => git log
2) Get the commit id of my last change in the 2(B) branch
3) Switch to the current (new) => git cherry-pick коммит-ид_2(Б)_бранчи

And then I get this:

The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch feature/GROS-6326_OagEmail
Your branch is up to date with 'origin/feature/GROS-6326_OagEmail'.

You are currently cherry-picking commit b2a9816f5.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

What am I not doing? I want to take the changes from the id-commit. Why does it say everything is empty?

Answer 1

I need to throw changes from branch 2(B) into branch 1(A). What am I doing:

Cherry pick is about a commit, not a branch
Perhaps you need a rebase or merge, not a cherry pick?