Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- esromg5@Esrom:~/mokee/vendor/xiaomi/ido$ git reset --hard a0a3de9aec41033baa2605ec133d6d412d369972
- HEAD is now at a0a3de9 ido: Ship prebuilt wcnss_service
- 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
- From ssh://review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido
- * branch refs/changes/26/21226/1 -> FETCH_HEAD
- On branch mkn-mr1
- Your branch is ahead of 'origin/mkn-mr1' by 1 commit.
- (use "git push" to publish your local commits)
- You are currently cherry-picking commit a0a3de9.
- 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
- Otherwise, please use 'git reset'
- esromg5@Esrom:~/mokee/vendor/xiaomi/ido$ git commit --allow-empty
- [mkn-mr1 24ac895] ido: Ship prebuilt wcnss_service
- Author: Anik1199 <anik9280@gmail.com>
- Date: Tue Jan 3 03:34:37 2017 +0600
- esromg5@Esrom:~/mokee/vendor/xiaomi/ido$ git push ssh://EsromG5@review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido HEAD:refs/for/mkn-mr1
- Counting objects: 1, done.
- Writing objects: 100% (1/1), 263 bytes | 0 bytes/s, done.
- Total 1 (delta 0), reused 0 (delta 0)
- remote: Processing changes: refs: 1, done
- To ssh://EsromG5@review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido
- ! [remote rejected] HEAD -> refs/for/mkn-mr1 (same Change-Id in multiple changes.
- Squash the commits with the same Change-Id or ensure Change-Ids are unique for each commit)
- error: failed to push some refs to 'ssh://EsromG5@review.mfunz.com:29418/MoKee/android_vendor_xiaomi_ido'
- esromg5@Esrom:~/mokee/vendor/xiaomi/ido$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement