Jazz Register Log in
Jazz Forum Welcome to the Jazz Community Forum

Welcome to the Jazz Community Forum

Connect and collaborate with IBM Engineering experts and users

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

0 votes



One answer

Permanent link
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.

0 votes

Your answer

Register or log in 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.

Search context
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
× 12,058

Question asked: Feb 03 '16, 11:49 a.m.

Question was seen: 2,717 times

Last updated: Feb 05 '16, 5:15 a.m.

Confirmation Cancel Confirm