Cherry-pick in gerrit web UI get "Cherry pick failed: merge conflict" but git cherry-pick is OK

[Chunlin Zhang]

I searched and found another similar thread "Cherry-pick via Gerrit UI fails due to conflict, but local git-cherry-pick works.", and know that after we upgrade to newer version gerrit we can try to enable 'Allow content merges' option.

But I don't understand why a cherry-pick action need a merge?

The git we got this error is frameworks/base (so I cannot provide the git to reproduce), there are 2 branches: b and b2 , b2 is create from b, if I modify a file in b branch, and this file is same in 2 branches, it can be web cherry-pick to b2, but from b2 modify same file, cannot web -cherry-pick to b.

For this file is same in 2 branches before modification, so it doesn't need to be merge because of no conflict, just apply the patch and it should be successful, why the error is "merge conflict"?

Thank you!