可能是重复的问题:
git空格问题
如何设置Git,在合并时不仅仅因为空格而报告冲突,就像下面这样?
<<<<<<< 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
ignore-all-space
选项的文档:如果他们的版本只是对一行进行了空格更改,则使用我们的版本。如果我们的版本引入了空格更改,但他们的版本包含了实质性的更改,则使用他们的版本。 - TachyonVortex