{"thread":{"id":"31904","subject":"git BUG","startedAt":"2012-10-22T16:28:20Z","lastAt":"2012-10-22T16:28:20Z","messageCount":1,"participants":["Коньков Евгений"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"201702","messageId":"863549238.20121022202820@reg.ru","threadId":"31904","inReplyTo":null,"subject":"git BUG","fromName":"Коньков Евгений","fromEmail":"kes@reg.ru","sentAt":"2012-10-22T16:28:20Z","receivedAt":"2012-10-22T16:28:20Z","isPatch":false,"sender":{"key":"kes@reg.ru","avatar":null},"body":"Hi, git\n\nI have get git bug while merging branches.\n\nthe farm has branch one year old. say b1\nI have develop some feature in this year so I start new branch\n  git checkout master\n  git checkout -b b2\n\nI get task to develop feature b1. b1 require changes in b2\n  git checkout b1\n  git merge b2\n  git checkout --theirs\n  git commit\n\nafter some time I need new code from master\n  git merge master\n\nafter this merge I notice that some code, that was developed in b2, is\ndisappeared despite on it was merged into b1\n\nso I start to merge it again:\n  git merge b2\n\nNo results. So I decide to do some testing. I go to b2\n  git checkout b2\n\nmake changes into file on b2:\ndiff --git a/lib/SRS/Domain.pm b/lib/SRS/Domain.pm\nindex 8fa1b1a..23a9429 100644\n--- a/lib/SRS/Domain.pm\n+++ b/lib/SRS/Domain.pm\n@@ -2804,6 +2804,7 @@ sub can_renew_state {\n sub zone {\n     my ( $self ) =  @_;\n\n+\n     load_class 'SRS::Comm::Zone::Domain';\n\n     return\n\nI have add one empty line to subroutine that have developed in b2.\n  git commit\n  git checkout b1\n  git merge b2\n\nand I get conflict:\n+++ b/lib/SRS/Domain.pm\n@@@ -2830,24 -2801,20 +2830,29 @@@ sub can_renew_state\n\n  =cut\n\n -sub zone {\n -    my ( $self ) =  @_;\n +sub can_cancel_transin {\n +    my $self = shift;\n\n++<<<<<<< HEAD\n +    return if $self->{freeze_date};\n +    return unless $self->{create_method} eq 'trans' && $self->{state} eq 'N';\n++=======\n+\n+     load_class 'SRS::Comm::Zone::Domain';\n++>>>>>>> yandex_mail_new_api\n\n -    return\n -        SRS::Comm::Zone::Domain->new(\n -            dname   => $self->{dname},\n -            service => $self,\n -        );\n +    my ( $pos_id ) = dbh_rw->selectrow_array(\n +        'SELECT bi.pos_id FROM billitems bi JOIN bills b ON b.bill_id = bi.bill_id WHERE service_id =\n +        undef,\n +        $self->{service_id}, $self->{user_id}\n +    );\n +\n +    return $pos_id;\n  }\n\n -=back\n +=item cancel_transin\n +\n +Ф-ция отмены переноса\n\n  =cut\n\n\nAs you can see conflict at 'can_cancel_transin' subroutine\nbut I do changes in 'zone' subroutine\n\n\nPlease help to resolve that CONFLICT and return code from b2 to be\nalive again in b1.\n\nAnd, if you can, please explain why this occur\n\n-- \n С уважением,\n Коньков Евгений\n Программист\n Регистратор доменных имен REG.RU\n Телефон: +38 (097) 7654-676\n www.reg.ru\n ___________________\n Sincerely yours,\n Konkov Eugen\n Developer\n Accredited domain Registrar REG.RU, LLC.\n Phone: +38 (097) 7654-676\n www.reg.ru/en/\n\nmailto:kes@reg.ru\n"}]}