slub.team team mailing list archive

[Matthias Ronge <matthias.ronge@xxxxxxxxxxxx>]

This change addresses code dedublication and simplification as reported in the comment. Fixing the bug almost was a side effect “just because I was around in that area”.

What is the reason for the merge conflict? src/messages/ contains 4 files. Both of the messages_*.properties have been moved to config/, Messages.java and intmessages.properties have been removed, so the directory imho should [!] be empty.

If the merge result you pasted here is meant as a log file, then the problem obviously is that Bazaar tries to remove the directory in advance of caring about the files in it; this would be a bug in Bazaar then. It could also be a permissions or locking issue…?
-- 
https://code.launchpad.net/~zeutschel/goobi-production/refactoring-messages/+merge/103284
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.