slub.team team mailing list archive
-
slub.team team
-
Mailing list archive
-
Message #00198
Re: lp:~zeutschel/goobi-production/refactoring-filesystem-and-shellscript-functions into lp:goobi-production
Review: Approve
> I agree on the white-space issue. With the renaming methods removed, this
> branch and the bug fix for bug #988813 should merge without problems.
Cannot be merged, as both branches add the same file. Conflicts have to be resolved manually on final merge. As it is to much work to separate individual changes in this merge request, we have go on with the single commit and integrate later on.
--
https://code.launchpad.net/~zeutschel/goobi-production/refactoring-filesystem-and-shellscript-functions/+merge/103683
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.
References