[Koha-bugs] [Bug 15434] Make search results breadcrumbs human readable

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434

--- Comment #14 from Srdjan Jankovic <srdjan at catalyst.net.nz> ---
(In reply to Nicole C. Engard from comment #11)
> That new patch doesn't apply either :(
> 
> Apply? [(y)es, (n)o, (i)nteractive] y
> Applying: Bug 15434: Search criteria definition table
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> error: The following untracked working tree files would be overwritten by
> merge:
> 	koha-tmpl/opac-tmpl/bootstrap/js/search.js
> Please move or remove them before you can merge.
> Aborting
> Failed to merge in the changes.
> Patch failed at 0001 Bug 15434: Search criteria definition table
> When you have resolved this problem run "git bz apply --continue".
> If you would prefer to skip this patch, instead run "git bz apply --skip".
> To restore the original branch and stop patching run "git bz apply --abort".
> Patch left in /tmp/Bug-15434-Search-criteria-definition-table-K9mxpF.patch
> 08:10 ~/kohaclone (bug15434-qa %|AM u=)$

Not sure why. I'm getting no errors:
srdjan at srdjan:~/koha/dev (bug_15434_wr251001)$ git checkout kc/master
Note: checking out 'kc/master'.
...
srdjan at srdjan:~/koha/dev ((e7e1da8...))$ git bz apply 15434
Bug 15434 - Make search results breadcrumbs human readable

46674 - Bug 15434: Search criteria definition table

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15434: Search criteria definition table
srdjan at srdjan:~/koha/dev ((084446e...))$

Maybe your tree was not clean for some reason? Can you please check git status
after checking out master, maybe there are some leftovers? That sometimes
happens to me when changing branches.

-- 
You are receiving this mail because:
You are watching all bug changes.