|
发表于 2016-8-3 07:13:17
只看该作者
6#
root@ubuntu:/home/lsc/RK3288/Android5.1# git pull bitbucket Firefly-RK3288:Firefly-RK3288
remote: Counting objects: 20378, done.
remote: Compressing objects: 100% (16377/16377), done.
remote: Total 20378 (delta 11368), reused 4044 (delta 2305)
Receiving objects: 100% (20378/20378), 286.98 MiB | 586 KiB/s, done.
Resolving deltas: 100% (11368/11368), done.
From https://bitbucket.org/T-Firefly/firenow-lollipop
8edf8bc..3daaa76 Firefly-RK3288 -> Firefly-RK3288
* [new tag] FirePrime_Android5.1_201506260948 -> FirePrime_Android5.1_201506260948
* [new tag] FirePrime_Android5.1_201507211424 -> FirePrime_Android5.1_201507211424
* [new tag] rk312x_android5.1_rel_v1.09_0529 -> rk312x_android5.1_rel_v1.09_0529
* [new tag] rk312x_android5.1_rel_v1.10_0603 -> rk312x_android5.1_rel_v1.10_0603
From https://bitbucket.org/T-Firefly/firenow-lollipop
* [new tag] Firefly-RK3288-Reload_Android5.1_201603151017 -> Firefly-RK3288-Reload_Android5.1_201603151017
* [new tag] Firefly-RK3288_Android5.1_201607151016 -> Firefly-RK3288_Android5.1_201607151016
* [new tag] rk3288_box_android-5.1_v2.00 -> rk3288_box_android-5.1_v2.00
Warning: fetch updated the current branch head.
Warning: fast-forwarding your working tree from
Warning: commit 8edf8bc1e1655f488bef409d848320977c5af641.
error: Entry 'kernel/scripts/kconfig/mconf' not uptodate. Cannot merge.
Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff 8edf8bc1e1655f488bef409d848320977c5af641
output, run
$ git reset --hard
to recover.
root@ubuntu:/home/lsc/RK3288/Android5.1# |
|