https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11175 Joonas Kylmälä <joonas.kylmala@helsinki.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |joonas.kylmala@helsinki.fi --- Comment #28 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- I cannot test this: Using index info to reconstruct a base tree... M C4/Search.pm M koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss M koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss Auto-merging C4/Search.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 11175: Show record component parts in the detail view The copy of the patch that failed is found in: .git/rebase-apply/patch Also would it be better to make adding Control-number-identifier to it's own patch and how is this handled with Elasticsearch now that it is also supported by koha? -- You are receiving this mail because: You are watching all bug changes.