https://bugs.documentfoundation.org/show_bug.cgi?id=156428
Bug ID: 156428
Summary: fodt format borks on git merging
Product: LibreOffice
Version: unspecified
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: normal
Priority: medium
Component: Writer
Assignee: [email protected]
Reporter: [email protected]
Being XML based, it's expected that the non-zipped version of the odt, the
fodt, would be able to be managed in a multi-user git workflow.
However, two users making and editing paragraphs and attempting to merge two
functioning versions of the same file reliably results in a broken file.
Upon investigation, this is because of the naming scheme for newly created
styles, paragraphs, sections, etc. Since paragraphs are named (or renamed) in
sequence instead of by some random unused hash, this moves merge conflicts
based off of internal file naming conventions from almost unheard of to
practically guaranteed.
Potential fix should change the numbering scheme to give XML section IDs more
unique hash names, or add a secondary random hash component to the sequential
name to avoid conflicts.
--
You are receiving this mail because:
You are the assignee for the bug.
