This is 2nd time I've got this error. "git cl land" to m53 branch (2785) fails in the middle.
The CL itself seems to be pushed. (https://chromium.googlesource.com/chromium/src.git/+/9f38962edfcc46c2dc91b426ce24fa43993529cc)
---
Review URL: https://codereview.chromium.org/2203393002 .
components/exo/wayland/server.cc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Fetching pending ref refs/pending/branch-heads/2785...
From https://chromium.googlesource.com/chromium/src
0205f03..222e235 refs/pending/branch-heads/2785 -> refs/git-cl/pending/branch-heads/2785
Cherry-picking commit on top of pending ref...
Pushing commit to refs/pending/branch-heads/2785... It can take a while.
error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git'
ERROR:git-retry:Process failure was not known to be transient; terminating with return code 1
Push failed with exit code 1.
To https://chromium.googlesource.com/chromium/src.git
! HEAD:refs/pending/branch-heads/2785 [remote rejected] (error in Gerrit backend)
Done
Retrying, 1 attempts left...
Fetching pending ref refs/pending/branch-heads/2785...
Cherry-picking commit on top of pending ref...
Pushing commit to refs/pending/branch-heads/2785... It can take a while.
error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git'
ERROR:git-retry:Process failure was not known to be transient; terminating with return code 1
Push failed with exit code 1.
To https://chromium.googlesource.com/chromium/src.git
! HEAD:refs/pending/branch-heads/2785 [remote rejected] (error in Gerrit backend)
Done
Retrying, 0 attempts left...
Fetching pending ref refs/pending/branch-heads/2785...
From https://chromium.googlesource.com/chromium/src
222e235..b640e30 refs/pending/branch-heads/2785 -> refs/git-cl/pending/branch-heads/2785
Cherry-picking commit on top of pending ref...
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 reset'
Your patch doesn't apply cleanly to ref 'refs/pending/branch-heads/2785', the following files have merge conflicts:
Please rebase your patch and try again.
Failed to push. If this persists, please file a bug.
Comment 1 by tandrii@chromium.org
, Aug 17 2016