[Koha-bugs] [Bug 10276] Extend IndependentBranches to support groups of libraries

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #21 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch currently doesn't apply. I tried applying it directly on master and on
top of bug 10277:

Signed-off-by:  Joel Sasse <jsasse at plumcreeklibrary.net>
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 10276 - Extend IndependentBranches to support groups of libraries
fatal: sha1 information is lacking or useless (C4/Items.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 10276 - Extend IndependentBranches to support groups
of libraries
The copy of the patch that failed is found in:
   /home/katrin/kohaclone/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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