error: could not read '.git/rebase-apply/head-name': No such file or directory

ebase (--continue | --abort | --skip) If that is not the case, please rm -fr ".git/rebase-apply" and run me again. I am stopping in case you still have something valuable there. I resolved this issue by git checkout -f some_br But this issues should not occur -- Best regards, Eugen Konkov

Re: bad patch created when I use --ignore-blank-lines option

::DbBatch split(/,/,q{list.conf;l 0;q});; > 1: sub t0 { > x2: 1; > @@ -235,6 +237,7 @@ ab>>2: 2; > @@ list from last > -e:0010 t2(); > > +-e > 14: > 15: > 16: > @@ -243,6 +246,7 @@ ab>>2: 2; > @@ list middle > -e:0010 t2(); > > +-e > x5: t0(); > 6: } > 7: sub t2 { > $ git --version > git version 2.22.0 -- Best regards, Eugen Konkov

bad patch created when I use --ignore-blank-lines option

43,6 +246,7 @@ ab>>2: 2; @@ list middle -e:0010 t2(); +-e x5: t0(); 6: } 7: sub t2 { $ git --version git version 2.22.0 -- Best regards, Eugen Konkov

Re: Why "Updated upstream" block is so small?

;static',1)" > +); +$sth->>execute( $package->login ); > + > +$sth = $radius_dbh->prepare( > +"INSERT INTO radcheck ( username, attribute, op, value ) values ( ?, > ?, ?, ? )" > +); > +# my $package_type = $package->Invoice->Order->Tariff->type; > +my $pass = $package->password; > +($pass) = (`smbencrypt $pass` =~ /([^\s]+)$/s); +$sth->>execute( $package->login, 'NT-Password', ':=', $pass //''); +$sth->>execute( $package->login, 'NAS-Identifier', '=~', 'ppp' ); > + > +$sth = $radius_dbh->prepare( > +"INSERT INTO radreply ( username, attribute, op, value, > nasip) values ( ?, 'Framed-IP-Address', '=', ?, ? )" > +); > +my $ip = $package->Ips->first; +# $sth->>execute( $package->login, $ip->ip, $ip->Listener->first->nas_ip ); > + +$radius_dbh->>commit; > +# NOTICE: This is a bit inconsistent > +# if whole payment failed we will have radius account without payment ++>>>>>>>> Stashed changes > > > return $package; > Why updated upstream block is so small? > ++<<<<<<< Updated upstream > + # NOTICE: This is a bit inconsistent > + # if whole payment failed we will have radius account without payment > + }; > ++||| merged common ancestors > > I suppose it should start from to line line: > + $radius_dbh->begin_work; > ... > +# if whole payment failed we will have radius account without payment -- Best regards, Eugen Konkov

Why "Updated upstream" block is so small?

$sth->execute( $package->login, 'NAS-Identifier', '=~', 'ppp' ); + +$sth = $radius_dbh->prepare( +"INSERT INTO radreply ( username, attribute, op, value, nasip) values ( ?, 'Framed-IP-Address', '=', ?, ? )" +); +my $ip = $package->Ips->first; +# $sth->execute( $package->login, $ip->ip, $ip->Listener->first->nas_ip ); + +$radius_dbh->commit; +# NOTICE: This is a bit inconsistent +# if whole payment failed we will have radius account without payment ++>>>>>>> Stashed changes return $package; Why updated upstream block is so small? ++<<<<<<< Updated upstream + # NOTICE: This is a bit inconsistent + # if whole payment failed we will have radius account without payment + }; ++||| merged common ancestors I suppose it should start from to line line: + $radius_dbh->begin_work; ... +# if whole payment failed we will have radius account without payment -- Best regards, Eugen Konkov

[BUG] Bad coloring

] tool = sublimerge colorMoved = default colorMovedWS = ignore-all-space -- Best regards, Eugen Konkov diff Description: Binary data

Re[2]: Improving auto conflict resolving while merge

Hi, Jeff. JK> For example, if you have the content: JK> foo(); JK> bar(); JK> baz(); JK> and one side makes it: JK> foo(); JK> x = 1; JK> bar(); JK> baz(); JK> and the other side does: JK> foo(); JK> bar(); JK> y = 2; JK> baz(); JK> you _could_ argue that those changes

Re[2]: Feature request: implement '--follow' option for `git blame`

Здравствуйте, Junio. Вы писали 13 апреля 2015 г., 8:32:33: JCH> Eugen Konkov writes: >> I agree with your complex example. JCH> Note that it is a norm, not anything complex, that we do not rename JCH> a file wholesale. >> But it will be great to guess in simple case,