[Koha-bugs] [Bug 7180] Order from staged file improvements

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180

--- Comment #6 from mathieu saby <mathieu.saby at univ-rennes2.fr> ---
I want to test this afternoon, but new error :
Could you please rebase it again?

<stdin>:347: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
merge:
    acqui/ajax-getauthvaluedropbox.pl
Please move or remove them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Bug 7180: Order from staged file improvements
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".
Patch left in /tmp/Bug-7180-Order-from-staged-file-improvements-CiHSV3.patch



M. Saby

-- 
You are receiving this mail because:
You are watching all bug changes.