我为以下问题进行了大量搜索,但没有得到任何实质性的信息。
我创建了一个临时分支202116,正在尝试对Gerrit 202116进行cherry-pick操作,但我收到了下面的消息。为什么我无法将此提交进行cherry-pick,并且为什么会出现此错误?
<>git fetch ssh://company@company.com:29418/platform/vendor/company-proprietary/radio refs/changes/25/202116/1 && git cherry-pick FETCH_HEAD
From ssh://company.com:29418/platform/vendor/company-proprietary/radio
* branch refs/changes/25/206025/1 -> FETCH_HEAD
# On branch 202116
# You are currently cherry-picking.
# (all conflicts fixed: run "git commit")
#
nothing to commit, working directory clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty