https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18316
--- Comment #73 from Jonathan Druart <[email protected]> --- (In reply to Séverine Queune from comment #72) > error: The following untracked working tree files would be overwritten by > merge: > installer/data/mysql/atomicupdate/bug_18316_add-weight-column.perl > t/db_dependent/Koha/SearchField.t This error means you have these files in your repo and the patch is trying to create it. You should remove them, then apply the patch. However there is another conflict later: CONFLICT (content): Merge conflict in Koha/Schema/Result/SearchField.pm -- 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/
