Apache OpenOffice (AOO) Bugzilla – Issue 107848
Add 3-way comparison to all types of documents
Last modified: 2013-08-07 14:38:26 UTC
Hello (Sorry that I couldn't find the best place to suggest this, since it applies to all OpenOffice Applications. Can someone move it to the correct place, please?) Today there is the option "Edit->Compare Document" that helps to merge two versions of the same document.However it would be extremely helpful it there could be a mechanism to perform a "3-way diff and merge" of documents triggered at the command line (ie. soffice.bin -writer base.odf this.odf other.odf). This feature alone would make it very easy to integrate OOO documents with major Version Control Systems. Specially the ones like Mercurial, Bazaar, Git, SVN and CVS. This simple feature could enable the customization of VCS (and DVCS) tools to use OpenOffice to performe merging and diffing of all OOO supported files. Moreover, when a 3-way diff is used it is much easier to detect real changes (additions and deletions). OOO could even have an option to trigger the merges automatically whenever there are no conflicts (two people haven't changed the same unit of work - line, paragraph, whatever). We could than use OOO documents in a truly revision controlled way! Thanks, Luis
Reassigned to Requirements