http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7572
Frederic Durand <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #33 from Frederic Durand <[email protected]> --- Trying to test it on a sandbox, did not work, here the message : Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Auth.pm CONFLICT (content): Merge conflict in C4/Auth.pm Auto-merging cataloguing/addbiblio.pl Auto-merging circ/circulation.pl Auto-merging installer/data/mysql/de-DE/mandatory/userflags.sql CONFLICT (content): Merge conflict in installer/data/mysql/de-DE/mandatory/userflags.sql Auto-merging installer/data/mysql/de-DE/mandatory/userpermissions.sql CONFLICT (content): Merge conflict in installer/data/mysql/de-DE/mandatory/userpermissions.sql Auto-merging installer/data/mysql/en/mandatory/userflags.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/userflags.sql Auto-merging installer/data/mysql/en/mandatory/userpermissions.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/userpermissions.sql Auto-merging installer/data/mysql/es-ES/mandatory/userflags.sql CONFLICT (content): Merge conflict in installer/data/mysql/es-ES/mandatory/userflags.sql Auto-merging installer/data/mysql/es-ES/mandatory/userpermissions.sql CONFLICT (content): Merge conflict in installer/data/mysql/es-ES/mandatory/userpermissions.sql Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql CONFLICT (content): Merge conflict in installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql CONFLICT (content): Merge conflict in installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql Auto-merging installer/data/mysql/it-IT/necessari/userflags.sql CONFLICT (content): Merge conflict in installer/data/mysql/it-IT/necessari/userflags.sql Auto-merging installer/data/mysql/it-IT/necessari/userpermissions.sql CONFLICT (content): Merge conflict in installer/data/mysql/it-IT/necessari/userpermissions.sql Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql CONFLICT (content): Merge conflict in installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql CONFLICT (content): Merge conflict in installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql Auto-merging installer/data/mysql/pl-PL/mandatory/userflags.sql CONFLICT (content): Merge conflict in installer/data/mysql/pl-PL/mandatory/userflags.sql Auto-merging installer/data/mysql/pl-PL/mandatory/userpermissions.sql CONFLICT (content): Merge conflict in installer/data/mysql/pl-PL/mandatory/userpermissions.sql Auto-merging installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql CONFLICT (content): Merge conflict in installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql Auto-merging installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql CONFLICT (content): Merge conflict in installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Failed to merge in the changes. -- 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/
