It's possible auto-merging binary files in SCM
I would like have auto-merging in binary files using SCM, because I have this binary type files and I don't want resolve conflicts, I want accept changes. See references using GIT : https://git-scm.com/book/uz/v2/Customizing-Git-Git-Attributes
|
One answer
It's hard to believe that you will let the machine merge a binary file, which will very likely get corrupted. You, as a human, should always take control.
The page that you linked tells how to use third-party tools to convert/extract certain types of binary files to text format so that Git can diff them and make the output more meaningful. There is no mention about the merge capability of binary files. |
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.