可能重复:
git whitespace woes
我如何设置不报告纯粹由于合并中的空白导致的冲突,如下所示?
<<<<<<< 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
最佳答案
尝试:
$ git merge -s ignore-all-space
有关详细信息:
$ git help merge
/whitespace