Git merge ignore spaces

Question

Possible Duplicate:
git whitespace woes

How can I setup get to not report conflicts purely due to whitespace on a merge, like the following ?

<<<<<<< HEAD
    open RESDBFILE, "< $this_day_result_file_";
    while ( my $resdbline_ = <RESDBFILE> )
    {
        my @rwords_ = split ' ', $resdbline_;
        if ( exists $uncaliberated_strategies_{$rwords_[0]} )
        { # if this strategy_filename_base was there in @strategy_filevec_
        delete $uncaliberated_strategies_{$rwords_[0]};
        }
    }
    close RESDBFILE;
=======
      open RESDBFILE, "< $this_day_result_file_";
      while ( my $resdbline_ = <RESDBFILE> )
      {
    my @rwords_ = split ' ', $resdbline_;
    if ( exists $uncaliberated_strategies_{$rwords_[0]} )
    { # if this strategy_filename_base was there in @strategy_filevec_
        delete $uncaliberated_strategies_{$rwords_[0]};
    }
      }
      close RESDBFILE;
>>>>>>> origin/stable

If it doesn't report it, how is it going to make the merge? Arbitrarily pick one to use? — Andy, Aug 05 '11 at 12:59
@Andy Very good question! According to the [docs](http://git-scm.com/docs/git-merge#_merge_strategies) for the `ignore-all-space` option: "If _their_ version only introduces whitespace changes to a line, _our_ version is used. If _our_ version introduces whitespace changes but _their_ version includes a substantial change, _their_ version is used." — TachyonVortex, Apr 09 '14 at 11:18

score 15 · Answer 1 · answered Aug 05 '11 at 14:52

15

Try:

$ git merge -s ignore-all-space

For more details:

$ git help merge
/whitespace

answered Aug 05 '11 at 14:52

holygeek

15,653
1
40
50

22

`git merge -Xignore-all-space` works for me...maybe its a version thing... – dsummersl May 18 '12 at 15:09
1

Same goes for `git cherry-pick -Xignore-all-space`. At least on the (almost) current version. – Deiwin Nov 12 '13 at 15:38

score 2 · Answer 2 · edited Sep 03 '20 at 07:28

2

You can try setting the core.whitespace config to see if that helps.

edited Sep 03 '20 at 07:28

vp_arth

14,461
4
37
66

answered Aug 05 '11 at 12:59

gpojd

22,558
8
42
71

That won't. core.whitespaces is about the set of problems to warn about, not about merge. – Matthieu Moy May 06 '15 at 13:38

Git merge ignore spaces

2 Answers2

Linked