From: KES <kes-kes@yandex.ru>
To: git <git@vger.kernel.org>
Subject: Not expected merge conflict output
Date: Tue, 21 Feb 2017 11:24:28 +0200 [thread overview]
Message-ID: <16011487669068@web22g.yandex.ru> (raw)
Hi. I have merge conflict and this output:
--- a/crypto/lib/Crypto/Routes.pm
+++ b/crypto/lib/Crypto/Routes.pm
@@@ -98,17 -94,16 +98,36 @@@ sub register
,payment_cancel_landing => '/payment-cancel'
}});
# Route configuration is moved from plugin:
++<<<<<<< ours
+ $rn->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_payment_s
+ $rn->get( '/stripe/payment_cancel' )->to( 'Stripe#payment_cancel' )->name( 'stripe_payment_c
+ $rn->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );
+ $rn->post( '/stripe/payment/create', { required_level => 'user' } )->to( 'Stripe#payment_creat
+ $rn->post( '/stripe/payment/execute', { required_level => 'user' } )->to( 'Stripe#payment_exec
++||||||| base
++ $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen
++ $guest->get( '/stripe/payment_cancel' )->to( 'Stripe#payment_cancel' )->name( 'stripe_paymen
++ $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );
++ $user->post( '/stripe/payment/create' )->to( 'Stripe#payment_create' )->name( 'stripe_paymen
++ $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen
++
++ $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );
++=======
+ $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen
+ $guest->get( '/stripe/payment_cancel' )->to( 'Stripe#payment_cancel' )->name( 'stripe_paymen
+ $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );
+ $user->post( '/stripe/payment/create' )->to( 'Stripe#payment_create' )->name( 'stripe_paymen
+ $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen
+
+ $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );
+ $guest->get ( '/stripe/:form' )->to( 'Stripe#button' );
++>>>>>>> theirs
+ $rn->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );
+ # Static routes
+ # QR code dowlnload url
+ $app->routes->get('/uploads/qrcode/:file')->name('qr_url');
But I expect this output:
--- a/crypto/lib/Crypto/Routes.pm
+++ b/crypto/lib/Crypto/Routes.pm
@@@ -98,17 -94,16 +98,36 @@@ sub register
,payment_cancel_landing => '/payment-cancel'
}});
# Route configuration is moved from plugin:
++<<<<<<< ours
+ $rn->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_payment_s
+ $rn->get( '/stripe/payment_cancel' )->to( 'Stripe#payment_cancel' )->name( 'stripe_payment_c
+ $rn->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );
+ $rn->post( '/stripe/payment/create', { required_level => 'user' } )->to( 'Stripe#payment_creat
+ $rn->post( '/stripe/payment/execute', { required_level => 'user' } )->to( 'Stripe#payment_exec
+ $rn->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );
++||||||| base
++ $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen
++ $guest->get( '/stripe/payment_cancel' )->to( 'Stripe#payment_cancel' )->name( 'stripe_paymen
++ $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );
++ $user->post( '/stripe/payment/create' )->to( 'Stripe#payment_create' )->name( 'stripe_paymen
++ $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen
++
++ $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );
++=======
+ $guest->get( '/stripe/payment_success' )->to( 'Stripe#payment_success' )->name( 'stripe_paymen
+ $guest->get( '/stripe/payment_cancel' )->to( 'Stripe#payment_cancel' )->name( 'stripe_paymen
+ $guest->options( '/stripe' )->to( 'Stripe#options' )->name( 'stripe_options' );
+ $user->post( '/stripe/payment/create' )->to( 'Stripe#payment_create' )->name( 'stripe_paymen
+ $user->post( '/stripe/payment/execute' )->to( 'Stripe#payment_execute' )->name( 'stripe_paymen
+
+ $guest->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );
+ $guest->get ( '/stripe/:form' )->to( 'Stripe#button' );
++>>>>>>> theirs
+ # Static routes
+ # QR code dowlnload url
+ $app->routes->get('/uploads/qrcode/:file')->name('qr_url');
Because this diff has less difference between ours&&base, Also
This (second expected patch)
+ # Static routes
+ # QR code dowlnload url
+ $app->routes->get('/uploads/qrcode/:file')->name('qr_url');
is less in compare to (first not expected):
+ $rn->post( '/stripe/hook' )->to( 'Stripe#hook' )->name( 'stripe_hook' );
+ # Static routes
+ # QR code dowlnload url
+ $app->routes->get('/uploads/qrcode/:file')->name('qr_url');
Did I wrong and first output is right thing or maybe I right and I should open new bug report.
Please explain me
reply other threads:[~2017-02-21 9:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16011487669068@web22g.yandex.ru \
--to=kes-kes@yandex.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox