https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16881
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #13 from Katrin Fischer <[email protected]> --- Taking a closer look this is really interesting as it's allowing to store the column definitions by user. Can you please rebase? 59567 - Bug 16881 - Apply KohaTable and ColVis plugin on MARCdetail's items table Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 16881 - Apply KohaTable and ColVis plugin on MARCdetail's items table Using index info to reconstruct a base tree... M api/v1/swagger/definitions.json M api/v1/swagger/paths.json M catalogue/MARCdetail.pl M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging catalogue/MARCdetail.pl Auto-merging api/v1/swagger/paths.json Auto-merging api/v1/swagger/definitions.json CONFLICT (content): Merge conflict in api/v1/swagger/definitions.json error: Failed to merge in the changes. Patch failed at 0001 Bug 16881 - Apply KohaTable and ColVis plugin on MARCdetail's items table The copy of the patch that failed is found in: .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-16881---Apply-KohaTable-and-ColVis-plugin-on-M-0QlVGC.patch sloth:/usr/local/vagrant/kohaclone_master (58-16881-colvis|AM 1/1) $ git status On branch 58-16881-colvis You are in the middle of an am session. (fix conflicts and then run "git am --continue") (use "git am --skip" to skip this patch) (use "git am --abort" to restore the original branch) -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
