Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- math@math:~/git/chas-ege$ git cherry-pick ceb5443dba935aec06cdcbb4dc6850dc743b3798
- fatal: bad object ceb5443dba935aec06cdcbb4dc6850dc743b3798
- math@math:~/git/chas-ege$ git fetch myfork
- remote: Counting objects: 27, done.
- remote: Total 27 (delta 19), reused 19 (delta 19), pack-reused 8
- Unpacking objects: 100% (27/27), done.
- From https://github.com/shellge/chas-ege
- * [new branch] b11_13 -> myfork/b11_13
- * [new branch] b11_par -> myfork/b11_par
- * [new branch] dev -> myfork/dev
- * [new branch] devel -> myfork/devel
- * [new branch] devel-matege15to16 -> myfork/devel-matege15to16
- * [new branch] dump_for_matfak2014 -> myfork/dump_for_matfak2014
- * [new branch] example2 -> myfork/example2
- * [new branch] fix-debug-20141205 -> myfork/fix-debug-20141205
- * [new branch] fixes201412 -> myfork/fixes201412
- * [new branch] integr20150125 -> myfork/integr20150125
- * [new branch] integr20150125-a -> myfork/integr20150125-a
- * [new branch] integr20150125-a-a -> myfork/integr20150125-a-a
- * [new branch] integr20150125-a-a-a -> myfork/integr20150125-a-a-a
- * [new branch] integr20150125-u -> myfork/integr20150125-u
- * [new branch] integr20150129 -> myfork/integr20150129
- * [new branch] master -> myfork/master
- * [new branch] matfak2014 -> myfork/matfak2014
- * [new branch] newtask-34 -> myfork/newtask-34
- * [new branch] newwords -> myfork/newwords
- * [new branch] nickkolok -> myfork/nickkolok
- * [new branch] obolnovdvig -> myfork/obolnovdvig
- * [new branch] obsch -> myfork/obsch
- * [new branch] refactoring-B13-7 -> myfork/refactoring-B13-7
- * [new branch] yug -> myfork/yug
- math@math:~/git/chas-ege$ git cherry-pick ceb5443dba935aec06cdcbb4dc6850dc743b3798
- error: не возможно согласовать ceb5443... Отрефакторена задача zdn/math2014/B13/7.js
- подсказка: после разрешения конфликта отметьте корректные пути
- подсказка: с помощью 'git add <paths>' или 'git rm <paths>'
- подсказка: и подтвердите изменения с помощью 'git commit'
- math@math:~/git/chas-ege$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement