我设置怎样才能不报告纯粹是由于由空格上合并冲突,像下面?
<<<<<<< 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
如果它不报告它,那怎样使合并?随意挑一个使用? – Andy
@安迪非常好的问题!根据[ignore-all-space]选项的[docs](http://git-scm.com/docs/git-merge#_merge_strategies):“如果_their_版本仅引入空格更改为一行,则_our_版本如果_our_版本引入空白变化,但是_their_版本包含实质性更改,则使用_their_版本。“ – TachyonVortex