{"thread":{"id":"45184","subject":"Not expected merge conflict output","startedAt":"2017-02-21T09:34:33Z","lastAt":"2017-02-21T09:34:33Z","messageCount":1,"participants":["KES"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"312195","messageId":"16011487669068@web22g.yandex.ru","threadId":"45184","inReplyTo":null,"subject":"Not expected merge conflict output","fromName":"KES","fromEmail":"kes-kes@yandex.ru","sentAt":"2017-02-21T09:24:28Z","receivedAt":"2017-02-21T09:34:33Z","isPatch":false,"sender":{"key":"kes-kes@yandex.ru","avatar":null},"body":"Hi. I have merge conflict and this output:\n\n--- a/crypto/lib/Crypto/Routes.pm\n+++ b/crypto/lib/Crypto/Routes.pm\n@@@ -98,17 -94,16 +98,36 @@@ sub register \n          ,payment_cancel_landing  =>  '/payment-cancel'\n      }});\n      # Route configuration is moved from plugin:\n++<<<<<<< ours\n +    $rn->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_payment_s\n +    $rn->get( '/stripe/payment_cancel'  )->to( 'Stripe#payment_cancel'  )->name( 'stripe_payment_c\n +    $rn->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );\n +    $rn->post( '/stripe/payment/create', { required_level => 'user' } )->to( 'Stripe#payment_creat\n +    $rn->post( '/stripe/payment/execute', { required_level => 'user' } )->to( 'Stripe#payment_exec\n++||||||| base\n++    $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen\n++    $guest->get( '/stripe/payment_cancel'  )->to( 'Stripe#payment_cancel'  )->name( 'stripe_paymen\n++    $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );\n++    $user->post( '/stripe/payment/create'  )->to( 'Stripe#payment_create'  )->name( 'stripe_paymen\n++    $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen\n++\n++    $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );\n++=======\n+     $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen\n+     $guest->get( '/stripe/payment_cancel'  )->to( 'Stripe#payment_cancel'  )->name( 'stripe_paymen\n+     $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );\n+     $user->post( '/stripe/payment/create'  )->to( 'Stripe#payment_create'  )->name( 'stripe_paymen\n+     $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen\n+ \n+     $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );\n+     $guest->get ( '/stripe/:form' )->to( 'Stripe#button' );\n++>>>>>>> theirs\n  \n +    $rn->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );\n  \n +    # Static routes\n +    # QR code dowlnload url\n +    $app->routes->get('/uploads/qrcode/:file')->name('qr_url');\n\n\nBut I expect this output:\n\n--- a/crypto/lib/Crypto/Routes.pm\n+++ b/crypto/lib/Crypto/Routes.pm\n@@@ -98,17 -94,16 +98,36 @@@ sub register \n          ,payment_cancel_landing  =>  '/payment-cancel'\n      }});\n      # Route configuration is moved from plugin:\n++<<<<<<< ours\n +    $rn->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_payment_s\n +    $rn->get( '/stripe/payment_cancel'  )->to( 'Stripe#payment_cancel'  )->name( 'stripe_payment_c\n +    $rn->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );\n +    $rn->post( '/stripe/payment/create', { required_level => 'user' } )->to( 'Stripe#payment_creat\n +    $rn->post( '/stripe/payment/execute', { required_level => 'user' } )->to( 'Stripe#payment_exec\n  \n +    $rn->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );\n++||||||| base\n++    $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen\n++    $guest->get( '/stripe/payment_cancel'  )->to( 'Stripe#payment_cancel'  )->name( 'stripe_paymen\n++    $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );\n++    $user->post( '/stripe/payment/create'  )->to( 'Stripe#payment_create'  )->name( 'stripe_paymen\n++    $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen\n++\n++    $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );\n++=======\n+     $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen\n+     $guest->get( '/stripe/payment_cancel'  )->to( 'Stripe#payment_cancel'  )->name( 'stripe_paymen\n+     $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );\n+     $user->post( '/stripe/payment/create'  )->to( 'Stripe#payment_create'  )->name( 'stripe_paymen\n+     $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen\n+ \n+     $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );\n+     $guest->get ( '/stripe/:form' )->to( 'Stripe#button' );\n++>>>>>>> theirs\n  \n +    # Static routes\n +    # QR code dowlnload url\n +    $app->routes->get('/uploads/qrcode/:file')->name('qr_url');\n\nBecause this diff has less difference between ours&&base, Also \n\nThis (second expected patch)\n +    # Static routes\n +    # QR code dowlnload url\n +    $app->routes->get('/uploads/qrcode/:file')->name('qr_url');\nis less in compare to (first not expected):\n  \n +    $rn->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );\n  \n +    # Static routes\n +    # QR code dowlnload url\n +    $app->routes->get('/uploads/qrcode/:file')->name('qr_url');\n\n\nDid I wrong and first output is right thing or maybe I right and I should open new bug report.\nPlease explain me\n"}]}