[WIP] Add UI element for alternate resolution strategies like "Keep Both"

lib/view/side-view.coffee

@@ -11,6 +11,9 @@ class SideView extends CoveringView
         @span class: 'pull-right', =>
           @button class: 'btn btn-xs inline-block-tight revert', click: 'revert', outlet: 'revertBtn', 'Revert'
           @button class: 'btn btn-xs inline-block-tight', click: 'useMe', outlet: 'useMeBtn', 'Use Me'
+          @button class: 'btn btn-xs inline-block-tight', click: 'useMeFirst', outlet: 'useMeFirstBtn', 'Use Me, Then Them'
+          @button class: 'btn btn-xs inline-block-tight', click: 'useMeLast', outlet: 'useMeLastBtn', 'Use Them, Then Me'
+          ## TODO: Add `title` attributes to describe these actions better?
 
   initialize: (@side, editor) ->
     @subs = new CompositeDisposable
@@ -61,6 +64,18 @@ class SideView extends CoveringView
   useMe: ->
     @side.resolve()
     @decorate()
+
+  useMeFirst: ->
+    ## FIXME: Use `ConflictedEditor#acceptOursThenTheirs` instead?
+    ## @side.resolve()
+    ## TODO: Get the _other_ side and resolve it, too...
+    @decorate()
+
+  useMeLast: ->
+    ## FIXME: Use `ConflictedEditor#acceptTheirsThenOurs` instead?
+    ## TODO: Get the _other_ side and resolve it, too...
+    ## @side.resolve()
+    @decorate()
 
   revert: ->
     @editor.setTextInBufferRange @side.marker.getBufferRange(), @side.originalText

spec/view/side-view-spec.coffee

@@ -47,10 +47,24 @@ describe 'SideView', ->
       expect(t).toBe("These are my changes\n")
       expect(ours.isDirty).toBe(false)
 
-  it 'triggers conflict resolution', ->
-    spyOn(ours, "resolve")
-    view.useMe()
-    expect(ours.resolve).toHaveBeenCalled()
+  describe 'conflict resolution', ->
+    it 'should call `resolve` for simple resolutions ("Use Me")' ->
+      spyOn(ours, "resolve")
+      view.useMe()
+      expect(ours.resolve).toHaveBeenCalled()
+
+    describe 'complex resolutions ("Keep Both")' ->
+      it 'should have an instance of `ConflictedEditor`' ->
+        expect(ours.editor).toBeDefined()
+        ## TODO: expect(ours.editor).toBe("ConflictedEditor")...?
+
+      it 'should call `ConflictedEditor#acceptOursThenTheirs` for "Use Me First"' ->
+        ## TODO: Setup spy
+        ## TODO: expect(spy).toHaveBeenCalled()
+
+      it 'should call `ConflictedEditor#acceptTheirsThenOurs` for "Use Me Last"' ->
+        ## TODO: Setup...
+        ## TODO: expect(spy).toHaveBeenCalled()
 
   describe 'when chosen as the resolution', ->