gerrit cherry pick

要在Gerrit中使用cherry-pick命令，首先需要在Gerrit的Web界面上点击"Download Patch"按钮，以获取cherry-pick命令。然后，在本地通过以下命令切换到远程分支的最新版本（假设我们的分支是main）：

git remote update origin
git checkout -b conflict_resolve_main origin/main

执行Gerrit的cherry-pick命令，类似于以下示例：

git fetch https://xxxxx.xxx.xxx/xxx/xxx/changes/xxxx && git cherry-pick FETCH_HEAD

确认cherry-pick后，可以使用`git log HEAD`查看当前的提交记录。<span class="em">1</span><span class="em">2</span><span class="em">3</span>
#### 引用[.reference_title]
- *1* [Gerrit 代码合并冲突解决](https://blog.csdn.net/mospuito/article/details/125613286)[target="_blank" data-report-click={"spm":"1018.2226.3001.9630","extra":{"utm_source":"vip_chatgpt_common_search_pc_result","utm_medium":"distribute.pc_search_result.none-task-cask-2~all~insert_cask~default-1-null.142^v92^chatsearchT3_1"}}] [.reference_item style="max-width: 50%"]
- *2* *3* [【git、gerrit】git cherry-pick的使用教程](https://blog.csdn.net/m0_45406092/article/details/128801881)[target="_blank" data-report-click={"spm":"1018.2226.3001.9630","extra":{"utm_source":"vip_chatgpt_common_search_pc_result","utm_medium":"distribute.pc_search_result.none-task-cask-2~all~insert_cask~default-1-null.142^v92^chatsearchT3_1"}}] [.reference_item style="max-width: 50%"]
[ .reference_list ]