https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37911
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply QA Contact|[email protected] |[email protected] |y.org | Keywords|Hackfest |rel_25_05_candidate, | |RM_priority --- Comment #133 from Katrin Fischer <[email protected]> --- Not trusting my self with Vue, can you please help and rebase ASAP? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 37911: Prototype vue islands within static pages Applying: Bug 37911: (follow-up) Correct wishful thinking in displayed comment about changes to data-props Applying: Bug 37911: (follow-up) Update to vue ^3.5.4, use vue's web component implementation instead Applying: Bug 37911: (follow-up) Experimental introduction of dynamic imports for code splitting Applying: Bug 37911: (follow-up) Use webpack import annotations for more concise chunk names Applying: Bug 37911: (follow-up) Scan for requested components in caller and lazy load Applying: Bug 37911: (follow-up) Enable usage of dependencies Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js M koha-tmpl/intranet-tmpl/prog/js/vue/stores/navigation.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/vue/stores/navigation.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/vue/stores/navigation.js Auto-merging koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js error: Failed to merge in the changes. Patch failed at 0001 Bug 37911: (follow-up) Enable usage of dependencies hint: Use 'git am --show-current-patch=diff' to see the failed 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-37911-follow-up-Enable-usage-of-dependencies-dwhd9503.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
