How to ignore merge conflict?

Question

I have next merge conflict:

<<<<<<< Updated upstream
    my( $c, $name ) =  (shift,shift);
  my %name =  defined $name ? ( name => $name ) : ();

||||||| merged common ancestors
    my( $c ) =  shift;
=======
    my( $c, $name ) =  (shift,shift);

  my %name =  defined $name ? ( name => $name ) : ();
>>>>>>> Stashed changes

<<<<<<< Updated upstream
    return $c->render_to_string( 'control/toggle', id => "toggle$id", %name, @_ );
||||||| merged common ancestors
  return $c->render_to_string( 'control/toggle', @_, id => "toggle$id" );
=======
    return $c->render_to_string( 'control/toggle', id => "toggle$id",  %name,  @_ );
>>>>>>> Stashed changes

Is there an option to ignore such conflicts if there are only changes in whitespace? Just like -w -b options

I can't even see the whitespace difference in the first conflict (it's clear in the second conflict: comma space space percent-sign `name`), but no, there's no such option. — torek, Jan 28 '18 at 21:27
@torek: In first example there is empty line difference. What do you think, will it be useful such option? — Eugen Konkov, Jan 29 '18 at 07:50
Given that Git has *some* white space handling (mostly at end-of-lines though), if you generalized it and made it workable with `git apply` and `git merge` both, it might well be useful. — torek, Jan 29 '18 at 15:32

score 13 · Accepted Answer · edited Mar 08 '20 at 15:01

13

Well, you can not ignore conflicts, because that means that something is wrong, and you have to tell Git that you fixed the conflict.

If you really want to keep the file as-is, you can remove the conflict diff lines, and then git add / git commit the files that were in conflict so that you keep all lines of the file.

Else, if you want to keep a specific version (either "theirs", meaning what you tried to merge into your local codebase or "ours", meaning your codebase) of the file, you can use :

git checkout --ours my/file

Or

git checkout --theirs my/file

Don't forget, then, to commit the files so that git is not in this weirdo conflict mode.

edited Mar 08 '20 at 15:01

Eugen Konkov

22,193
17
108
158

answered Jan 28 '18 at 20:46

MeuhMeuh

826
6
26

If we ignore spaces then there is no conflict. So nothing is wrong, is not? – Eugen Konkov Jan 29 '18 at 07:48
1

The whitespace is what makes the conflict. It's up to you to choose which line to use. – evolutionxbox Jan 29 '18 at 09:25

score 4 · Answer 2 · answered Dec 14 '21 at 06:00

4

The simplest way, if you have unmerged paths, use git merge --abort to abort the merge. This way your code will look the same as it was before trying to merge with some other branch...

answered Dec 14 '21 at 06:00

Nyobord Moga

41
1

How to ignore merge conflict?

2 Answers2

Linked

Related