Advertisement
Guest User

Git bz apply problem

a guest
Oct 29th, 2013
113
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 0.85 KB | None | 0 0
  1. root@koha:~/kohaclone# git bz apply 11157
  2. Bug 11157 - Placing a simple item-level hold for serials.
  3.  
  4. 22522 - Bug 11157 - Placing a simple item-level hold for serials.
  5.  
  6. Apply? [(y)es, (n)o, (i)nteractive] y
  7. Applying: Bug 11157 - Placing a simple item-level hold for serials.
  8. fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt).
  9. Repository lacks necessary blobs to fall back on 3-way merge.
  10. Cannot fall back to three-way merge.
  11. Patch failed at 0001 Bug 11157 - Placing a simple item-level hold for serials.
  12. When you have resolved this problem run "git bz apply --continue".
  13. If you would prefer to skip this patch, instead run "git bz apply --skip".
  14. To restore the original branch and stop patching run "git bz apply --abort".
  15. Patch left in /tmp/Bug-11157---Placing-a-simple-item-level-hold-for-s-DkotIX.patch
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement