[Koha-bugs] [Bug 25078] Update DB process - wrap each DBRev inside a transaction and better error handling
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Jul 7 18:16:15 CEST 2021
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25078
--- Comment #76 from Victor Grousset/tuxayo <victor at tuxayo.net> ---
I get the following conflict when applying the rest of patches after «- Make
sure the different use cases are covered»
<<<<<<< HEAD ---- this is the code after applying «DB revs for testing»
$VERSION = "21.06.00.100";
||||||| constructed merge base
$VERSION = "21.06.00.004"; --- code in master before the patch that I'm
applying
=======
$VERSION = "21.06.00.005"; --- code from the patch that I'm applying
>>>>>>> Bug 25078: Put db revs into different files to handle them better
I should keep 21.06.00.100 right?
But I'm confused that «Put db revs into different [...]» changes the version.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list