Public Pastes
Guest

Nicole

By: a guest on Feb 3rd, 2010  |  syntax: None  |  size: 1.28 KB  |  hits: 125  |  expires: Never
download  |  raw  |  embed  |  report abuse
Copied
  1. nengard@debian:~/kohaclone$ git rebase origin
  2. First, rewinding head to replay your work on top of it...
  3. Applying Bug 3839: update admin menus to include links to both new acq admin areas
  4. .dotest/patch:59: trailing whitespace.
  5.        
  6. error: patch failed: koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:6
  7. error: koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc: patch does not apply
  8. error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:76
  9. error: koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl: patch does not apply
  10. Using index info to reconstruct a base tree...
  11. <stdin>:59: trailing whitespace.
  12.        
  13. warning: 1 line adds whitespace errors.
  14. Falling back to patching base and 3-way merge...
  15. Auto-merged koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
  16. CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
  17. Auto-merged koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
  18. Failed to merge in the changes.
  19. Patch failed at 0001.
  20.  
  21. When you have resolved this problem run "git rebase --continue".
  22. If you would prefer to skip this patch, instead run "git rebase --skip".
  23. To restore the original branch and stop rebasing run "git rebase --abort".
  24.  
  25. nengard@debian:~/kohaclone$
create a new version of this paste RAW Paste Data