Resolve conflicts I understand

app/views/projects/jobs/_sidebar.html.haml

@@ -68,7 +68,6 @@
         - elsif @build.runner
           \##{@build.runner.id}
       .btn-group.btn-group-justified{ role: :group }
-<<<<<<< HEAD:app/views/projects/jobs/_sidebar.html.haml
         - if @build.has_trace?
           = link_to 'Raw', raw_namespace_project_job_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default'
         - if @build.active?
@@ -78,10 +77,6 @@
                     class: "btn btn-sm btn-default", method: :post,
                     data: { confirm: "Are you sure you want to erase this build?" } do
             Erase
-=======
-        - if @build.active?
-          = link_to "Cancel", cancel_namespace_project_job_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post
->>>>>>> upstream/master:app/views/projects/jobs/_sidebar.html.haml
 
     - if @build.trigger_request
       .build-widget

app/views/projects/jobs/show.html.haml

@@ -64,11 +64,6 @@
             Showing last
             %span.js-truncated-info-size.truncated-info-size><
             KiB of log -
-<<<<<<< HEAD:app/views/projects/jobs/show.html.haml
-            %a.js-raw-link.raw-link{ :href => raw_namespace_project_job_path(@project.namespace, @project, @build) }>< Complete Raw
-          %code.bash.js-build-output
-          .build-loader-animation.js-build-refresh
-=======
             %a.js-raw-link.raw-link{ href: raw_namespace_project_job_path(@project.namespace, @project, @build) }>< Complete Raw
           .controllers
             - if @build.has_trace?
@@ -85,7 +80,6 @@
                         title: 'Erase Build',
                         class: 'has-tooltip js-erase-link' do
                 = icon('trash')
->>>>>>> upstream/master:app/views/projects/jobs/show.html.haml
 
             %button.js-scroll-up.btn-scroll.btn-transparent.btn-blank.has-tooltip{ type: 'button',
                     disabled: true,

lib/gitlab/utils.rb

@@ -22,7 +22,15 @@ module Gitlab
       nil
     end
 
-<<<<<<< HEAD
+    def boolean_to_yes_no(bool)
+      if bool
+        'Yes'
+      else
+        'No'
+      end
+    end
+
+    # EE below
     def try_megabytes_to_bytes(size)
       Integer(size).megabytes
     rescue ArgumentError
@@ -44,14 +52,6 @@ module Gitlab
       end
 
       nil
-=======
-    def boolean_to_yes_no(bool)
-      if bool
-        'Yes'
-      else
-        'No'
-      end
->>>>>>> upstream/master
     end
   end
 end

spec/features/projects/jobs_spec.rb

@@ -416,11 +416,7 @@ feature 'Jobs', :feature do
           Capybara.current_session.driver.headers = { 'X-Sendfile-Type' => 'X-Sendfile' }
           build.run!
           visit namespace_project_job_path(project.namespace, project, build)
-<<<<<<< HEAD:spec/features/projects/jobs_spec.rb
-          page.within('.js-build-sidebar') { click_link 'Raw' }
-=======
           find('.js-raw-link-controller').click()
->>>>>>> upstream/master:spec/features/projects/jobs_spec.rb
         end
 
         it 'sends the right headers' do

spec/lib/gitlab/utils_spec.rb

 require 'spec_helper'
 
 describe Gitlab::Utils, lib: true do
-<<<<<<< HEAD
-  delegate :to_boolean, :which, to: :described_class
-=======
   delegate :to_boolean, :boolean_to_yes_no, to: :described_class
->>>>>>> upstream/master
+
+  # EE
+  delegate :which, to: :described_class
 
   describe '.to_boolean' do
     it 'accepts booleans' do
@@ -37,18 +36,19 @@ describe Gitlab::Utils, lib: true do
     end
   end
 
-<<<<<<< HEAD
+  describe '.boolean_to_yes_no' do
+    it 'converts booleans to Yes or No' do
+      expect(boolean_to_yes_no(true)).to eq('Yes')
+      expect(boolean_to_yes_no(false)).to eq('No')
+    end
+  end
+
+  # EE
   describe '.which' do
     it 'finds the full path to an executable binary' do
       expect(File).to receive(:executable?).with('/bin/sh').and_return(true)
 
       expect(which('sh', 'PATH' => '/bin')).to eq('/bin/sh')
-=======
-  describe '.boolean_to_yes_no' do
-    it 'converts booleans to Yes or No' do
-      expect(boolean_to_yes_no(true)).to eq('Yes')
-      expect(boolean_to_yes_no(false)).to eq('No')
->>>>>>> upstream/master
     end
   end
 end