CODEWITHSUNDEEP
mergemercurialms-word
Dov
Dov

Reputation: 8572

Any way to merge documents with mercurial but never attempt to resolve conflicts?

This is a followon question to:

svn or mercurial version control of word documents

Since mercurial has the ability to process zipped files, it might be able to handle word docs. But if it embeds change text, word is going to blow up.

In mercurial, is there any way to either merge a file, or report that it needs to be manually merged without actually getting the file and injecting bad characters in it?

Upvotes: 2

Views: 258

Answers (1)

Oben Sonne
Oben Sonne

Reputation: 9953

I'd guess all you need to do is to set up an interactive merge tool. If this does not work, have a look at merge patterns.

Upvotes: 5

Related Questions