解决在一个topic branch上有多个cherry pick commit修改后repo upload 失败问题

 solve repo upload failed problem due to nochanges made

最近在工作中碰到了这个问题, 在探讨一番后解决了,由于工作书面语言是英语,所以就用英语写了。

In a topic branch, when you have cherry-pick several commits, such as two commits (A and B, B is depend onA), then you made changes on latest commit B, at the end you try to repo upload, it might failed with message “remote reject…..no changes made”.

How to solve it?

From the “git log”, get thecommit A’s commit id,  

for example 489d62d7a0feb3e95d1e7dcdc446be1be51175f6,then do

git rebase -i489d62d7a0feb3e95d1e7dcdc446be1be51175f6

  // Then it would pop up a dialog, change the onerelated to commit A from "pick" to "edit"

// then change commit A’scomment,

 git commit --amend

 git rebase --continue

 repo upload .

这样就可以顺利上传了。

猜你喜欢

转载自blog.csdn.net/flywalker/article/details/40155593
今日推荐