It's all about the answers!

Ask a question

Itś possible auto-merging in binary files using SCM ?


Fabiano lima (1729) | asked Feb 03 '16, 1:20 p.m.
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



permanent link
Surya Tripathi (65017) | answered Feb 03 '16, 3:11 p.m.
Binary files are not auto resolvable in SCM. RTC SCM however does support resolving with proposed or mine where you can basically choose between local or remote copy of the file.

Your answer


Register or to post your answer.