From 7684e7b2ada113b8a103a66bc88f892ee593f1e6 Mon Sep 17 00:00:00 2001 From: Christian Guenter Date: Sun, 8 Jul 2018 09:40:00 +0000 Subject: [PATCH] merge page: remove duplication --- src/ui/zcl_abapgit_gui_page_merge.clas.abap | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ui/zcl_abapgit_gui_page_merge.clas.abap b/src/ui/zcl_abapgit_gui_page_merge.clas.abap index 118d4dc3c..fd4bcd314 100644 --- a/src/ui/zcl_abapgit_gui_page_merge.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_merge.clas.abap @@ -190,7 +190,6 @@ CLASS zcl_abapgit_gui_page_merge IMPLEMENTATION. EXPORTING io_repo = mo_repo io_stage = mo_merge->get_result( )-stage. - ev_state = zif_abapgit_definitions=>gc_event_state-new_page. ELSE. @@ -198,11 +197,13 @@ CLASS zcl_abapgit_gui_page_merge IMPLEMENTATION. EXPORTING io_repo = mo_repo io_stage = mo_merge->get_result( )-stage. - ev_state = zif_abapgit_definitions=>gc_event_state-new_page. ENDIF. + ev_state = zif_abapgit_definitions=>gc_event_state-new_page. + WHEN c_actions-res_conflicts. + CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_merge_res EXPORTING io_repo = mo_repo