https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11999
--- Comment #129 from Fridolin Somers <[email protected]> --- (In reply to Joonas Kylmälä from comment #123) > I didn't realize the follow-ups here removed those git merge conflict > resolution hints. It would still probably be better if the conflicts were > solved in the patches they happen. If I review the patch "Test improvements > + check maxreserves" it contains merge resolution and test improvements, so > two things, git commits should do just one thing. Also "Bug 11999: (QA > follow-up)" doesn't say what it does. I've squashed fixes from QA follow-up inside patches. And rebase master. I set back to Needs Signoff -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
