Advertisement
Guest User

Untitled

a guest
Feb 9th, 2016
62
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.25 KB | None | 0 0
  1. math@math:~/git/chas-ege$ git cherry-pick ceb5443dba935aec06cdcbb4dc6850dc743b3798
  2. fatal: bad object ceb5443dba935aec06cdcbb4dc6850dc743b3798
  3. math@math:~/git/chas-ege$ git fetch myfork
  4. remote: Counting objects: 27, done.
  5. remote: Total 27 (delta 19), reused 19 (delta 19), pack-reused 8
  6. Unpacking objects: 100% (27/27), done.
  7. From https://github.com/shellge/chas-ege
  8. * [new branch] b11_13 -> myfork/b11_13
  9. * [new branch] b11_par -> myfork/b11_par
  10. * [new branch] dev -> myfork/dev
  11. * [new branch] devel -> myfork/devel
  12. * [new branch] devel-matege15to16 -> myfork/devel-matege15to16
  13. * [new branch] dump_for_matfak2014 -> myfork/dump_for_matfak2014
  14. * [new branch] example2 -> myfork/example2
  15. * [new branch] fix-debug-20141205 -> myfork/fix-debug-20141205
  16. * [new branch] fixes201412 -> myfork/fixes201412
  17. * [new branch] integr20150125 -> myfork/integr20150125
  18. * [new branch] integr20150125-a -> myfork/integr20150125-a
  19. * [new branch] integr20150125-a-a -> myfork/integr20150125-a-a
  20. * [new branch] integr20150125-a-a-a -> myfork/integr20150125-a-a-a
  21. * [new branch] integr20150125-u -> myfork/integr20150125-u
  22. * [new branch] integr20150129 -> myfork/integr20150129
  23. * [new branch] master -> myfork/master
  24. * [new branch] matfak2014 -> myfork/matfak2014
  25. * [new branch] newtask-34 -> myfork/newtask-34
  26. * [new branch] newwords -> myfork/newwords
  27. * [new branch] nickkolok -> myfork/nickkolok
  28. * [new branch] obolnovdvig -> myfork/obolnovdvig
  29. * [new branch] obsch -> myfork/obsch
  30. * [new branch] refactoring-B13-7 -> myfork/refactoring-B13-7
  31. * [new branch] yug -> myfork/yug
  32. math@math:~/git/chas-ege$ git cherry-pick ceb5443dba935aec06cdcbb4dc6850dc743b3798
  33. error: не возможно согласовать ceb5443... Отрефакторена задача zdn/math2014/B13/7.js
  34. подсказка: после разрешения конфликта отметьте корректные пути
  35. подсказка: с помощью 'git add <paths>' или 'git rm <paths>'
  36. подсказка: и подтвердите изменения с помощью 'git commit'
  37. math@math:~/git/chas-ege$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement