> On Sep 4, 2015, at 6:48 AM, Jeff Warnica <j...@coherentnetworksolutions.com> > wrote: > > Git can automatically unpack the zips and do the needful on this raw XML. > Apparently. > > https://tante.cc/2010/06/23/managing-zip-based-file-formats-in-git/ > On Sep 4, 2015 8:26 AM, "Mike Evans" <mi...@saxicola.co.uk> wrote:
Not quite. That option applies to diffs, not merges. In order to merge it would have to decompress the files, merge them, conditionally present them for conflict resolution, then recompress the result. It’s certainly possible to write such a tool and it might be possible to set up git to use it when it encounters a zipped file. Regards, John Ralls _______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
