It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Guidelines | FAQ
Follow this question
Question details

×42,884
×12,011

question asked: Feb 03 '16, 1:20 p.m.
question was seen: 2,277 times
last updated: Feb 03 '16, 3:11 p.m.

Related questions

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

0
Fabiano lima (17●5●16) | 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

Most liked answers ↑|Newest answers|Oldest answers

0
permanent link
Surya Tripathi (650●1●7) | 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.


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.