https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38663 --- Comment #17 from David Cook <dcook@prosentient.com.au> --- (In reply to Pedro Amorim from comment #16)
(In reply to David Nind from comment #15)
The patches no longer apply - sha1/fake ancestor error:
Hi! Can't reproduce, sorry! Just tested twice on up to date with main branch, it applies. Can you please double-check? Thanks!
Yeah, I have the same problem as David N. You probably won't have that problem, Pedro, as you'll have the git ancestor in your repo while we don't. (In this case, it looks like 62e85cc3eab is the ancestor that you'll have which isn't in the upstream main branch. It might be interesting to see what that hash resolves to in your repo using "git show".) If you can fetch the latest upstream and then rebase against that main branch, that should fix the problem for us. -- You are receiving this mail because: You are watching all bug changes.