Git merge ignore conflict from one branch?

Question

I have git setup with an xcode project. Inside that project is a .storyboard file which is a very long xml file.

This file causes many conflicts when merging, because when updating the layout all views can get a minor change in their position or size by sometimes only 1px.

I have some branches in my git.

When Im on my master branch and want to merge master with my Test branch i get around 30 conflicts in that particular file.

Because it looks like this when there is a conflict:

>>>>>> HEAD 
           <Some stuff />
======
           <Some stufff />
>>>>>> Test

Is it possible to remove all the conflicts from HEAD or the branch I merged with?

In source tree there's the option of `resolve using mine/theirs`. Not sure how it is on other GUIs. — Lord Zsolt, Mar 27 '15 at 10:44
@Thomas Dont I need to install something for that? I remember I did this before by some very simple method I found but I forgot it. — Arbitur, Mar 27 '15 at 10:45

score 2 · Accepted Answer · edited May 23 '17 at 12:30

2

When the conflict arrives there are three files created

File of branch in which you are says ours (master in your case)
File of branch you want to merge says theirs (test in your case)
File with all the conflicts

and you can do the followings

Keep master branch files using git checkout --ours <file path>
Keep test branch files using git checkout --theirs <files path>
Resolve the conflicts manually

You can read more about it

edited May 23 '17 at 12:30

Community

1
1

answered Mar 27 '15 at 10:50

Dau

8,578
4
23
48

This seems to be what I forgot about, And if I only put a . in file path every file will ignore ours/theirs? – Arbitur Mar 27 '15 at 10:52
As I havn't try the `.`, you can try it yourself – Dau Mar 27 '15 at 10:54
Thanks I'll try this and come back with your accept – Arbitur Mar 27 '15 at 10:56

Git merge ignore conflict from one branch?

1 Answers1