On Thu, 27 Feb 2014 04:59:38 -0800 (PST) Joao Emanuel Simonini <joaoemanuel1...@gmail.com> wrote:
> * Sorry for horrible english, is not my native language. > > I like to know if can possible use GIT for works with MS Office and > LibreOffice files? Can merge files or only can make a repository? If by "can merge files" you mean "be able to reconcile conflicts in MSO and LibO files" then the answer is no. At least "not easily": Git only includes machinery to deal with conflicting changes in textual files (using 7- or 8-byte encodings) and MSO and LibO files are binary (they are zip archives). This means, without extra effort, in case a conflict occurs, you'll only be able to pick one side of it and take it as "winning" the conflict. On the other hand, both software packages provide their own versioning support for the documents they manage: https://help.libreoffice.org/Common/Compare_Document http://office.microsoft.com/en-001/word-help/compare-and-merge-documents-HP005188939.aspx so you could possibly adopt a policy of always recording versions of the documents, and should a conflict occur, resolve it using the MSO and LibO themselves and then deem the resulting file as having the changes reconciled. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
