我遇到了下一个合并冲突:
<<<<<<< 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
如果只有空格的更改,是否有忽略此类冲突的选项?就像-w -b
选项一样。
name
),但是,没有这样的选项。 - torekgit apply
和git merge
一起使用,这将非常有用。 - torek