http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7439
Paul Poulain <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |[email protected] --- Comment #7 from Paul Poulain <[email protected]> 2012-01-16 14:39:00 UTC --- mmm... am I doing something wrong, the patch does not apply for me, I get: [PASSED_QA][Rel 3.6.x] Bug 7439: Add mailmap for jcamins Apply? [yn] y Applying: Bug 7439: Add mailmap for jcamins Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: refusing to lose untracked file at '.mailmap' CONFLICT (delete/modify): .mailmap deleted in HEAD and modified in Bug 7439: Add mailmap for jcamins. Version Bug 7439: Add mailmap for jcamins of .mailmap left in tree. Failed to merge in the changes. Patch failed at 0001 Bug 7439: Add mailmap for jcamins When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". .mailmap is not tracked by git (but exist... how can this happend ? -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- 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/
