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

Fabiano lima

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

0 votes

1 answer

2,351 views

0 votes

One answer

Permanent link

Surya Tripathi

(650●1●7) 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.

0 votes

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.

Follow this question

By Email:

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers

Answers and Comments

Question details

rational-team-concert

× 42,899

usage

× 12,020

Question asked: Feb 03 '16, 1:20 p.m.

Question was seen: 2,351 times

Last updated: Feb 03 '16, 3:11 p.m.

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

Fabiano lima

1 answer

2,351 views

0 votes

One answer

Surya Tripathi

Your answer

Follow this question

Question details

Related questions