Resolve app/services/git_push_service.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/services/git_push_service.rb

@@ -139,15 +139,10 @@ class GitPushService < BaseService
     UpdateMergeRequestsWorker
       .perform_async(project.id, current_user.id, params[:oldrev], params[:newrev], params[:ref])
 
-<<<<<<< HEAD
-    mirror_update = @project.mirror? && @project.repository.up_to_date_with_upstream?(branch_name)
+    mirror_update = project.mirror? && project.repository.up_to_date_with_upstream?(branch_name)
 
-    EventCreateService.new.push(@project, current_user, build_push_data)
-    Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute(:push, mirror_update: mirror_update)
-=======
     EventCreateService.new.push(project, current_user, build_push_data)
-    Ci::CreatePipelineService.new(project, current_user, build_push_data).execute(:push)
->>>>>>> ce/master
+    Ci::CreatePipelineService.new(project, current_user, build_push_data).execute(:push, mirror_update: mirror_update)
 
     SystemHookPushWorker.perform_async(build_push_data.dup, :push_hooks)
     project.execute_hooks(build_push_data.dup, :push_hooks)