Bug 156428 - fodt format borks on git merging
Summary: fodt format borks on git merging
Status: RESOLVED DUPLICATE of bug 85660
Alias: None
Product: LibreOffice
Classification: Unclassified
Component: Writer (show other bugs)
Version:
(earliest affected)
unspecified
Hardware: All All
: medium normal
Assignee: Not Assigned
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-07-23 06:35 UTC by mj66lny1
Modified: 2023-08-08 23:47 UTC (History)
1 user (show)

See Also:
Crash report or crash signature:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description mj66lny1 2023-07-23 06:35:33 UTC
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.
Comment 1 Stéphane Guillou (stragu) 2023-08-08 23:47:03 UTC
Thank you for the suggestion. Improving flat ODF for easier version control is already tracked in bug 85660, so marking as a duplicate.

*** This bug has been marked as a duplicate of bug 85660 ***