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
