[Koha-bugs] [Bug 19474] Convert staff client CSS to SCSS
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Thu Oct 26 03:01:34 CEST 2017
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19474
Dilan Johnpullé <dilan at calyx.net.au> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |dilan at calyx.net.au
--- Comment #5 from Dilan Johnpullé <dilan at calyx.net.au> ---
Patch fails to apply in devbox. The following is from my terminal.
vagrant at kohadevbox:kohaclone((dafb678...))$ git bz apply -s 19474
Bug 19474 - Convert staff client CSS to SCSS
68211 - Bug 19474: Convert staff client CSS to SCSS
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19474: Convert staff client CSS to SCSS
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/css/staff-global.css
deleted in Bug 19474: Convert staff client CSS to SCSS and modified in HEAD.
Version HEAD of koha-tmpl/intranet-tmpl/prog/css/staff-global.css left in tree.
Failed to merge in the changes.
Patch failed at 0001 Bug 19474: Convert staff client CSS to SCSS
The copy of the patch that failed is found in:
/home/vagrant/kohaclone/.git/rebase-apply/patch
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-19474-Convert-staff-client-CSS-to-SCSS-bSMH6p.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list