https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11999 --- Comment #123 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- 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. -- You are receiving this mail because: You are watching all bug changes.