daily pastebin goal
57%
SHARE
TWEET

Error push

a guest Apr 21st, 2017 262 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. esromg5@Esrom:~/mokee/vendor/xiaomi/ido$ git reset --hard a0a3de9aec41033baa2605ec133d6d412d369972
  2. HEAD is now at a0a3de9 ido: Ship prebuilt wcnss_service
  3. esromg5@Esrom:~/mokee/vendor/xiaomi/ido$ git fetch ssh://EsromG5@review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido refs/changes/26/21226/1 && git cherry-pick FETCH_HEAD
  4. From ssh://review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido
  5.  * branch            refs/changes/26/21226/1 -> FETCH_HEAD
  6. On branch mkn-mr1
  7. Your branch is ahead of 'origin/mkn-mr1' by 1 commit.
  8.   (use "git push" to publish your local commits)
  9. You are currently cherry-picking commit a0a3de9.
  10.  
  11. nothing to commit, working directory clean
  12. The previous cherry-pick is now empty, possibly due to conflict resolution.
  13. If you wish to commit it anyway, use:
  14.  
  15.     git commit --allow-empty
  16.  
  17. Otherwise, please use 'git reset'
  18. esromg5@Esrom:~/mokee/vendor/xiaomi/ido$ git commit --allow-empty
  19. [mkn-mr1 24ac895] ido: Ship prebuilt wcnss_service
  20.  Author: Anik1199 <anik9280@gmail.com>
  21.  Date: Tue Jan 3 03:34:37 2017 +0600
  22. esromg5@Esrom:~/mokee/vendor/xiaomi/ido$ git push ssh://EsromG5@review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido HEAD:refs/for/mkn-mr1
  23. Counting objects: 1, done.
  24. Writing objects: 100% (1/1), 263 bytes | 0 bytes/s, done.
  25. Total 1 (delta 0), reused 0 (delta 0)
  26. remote: Processing changes: refs: 1, done
  27. To ssh://EsromG5@review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido
  28.  ! [remote rejected] HEAD -> refs/for/mkn-mr1 (same Change-Id in multiple changes.
  29. Squash the commits with the same Change-Id or ensure Change-Ids are unique for each commit)
  30. error: failed to push some refs to 'ssh://EsromG5@review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido'
  31. esromg5@Esrom:~/mokee/vendor/xiaomi/ido$
RAW Paste Data
Top