 
       if @state.isEmpty()
         @pkg.didCompleteConflictResolution()
-        @finish(SuccessView)
 
-  finish: (viewClass) ->
+        detail = "That's everything. "
+        if @state.isRebase
+          detail += '"git rebase --continue" at will to resume rebasing.'
+        else
+          detail += '"git commit" at will to finish the merge.'
+
+        @finish ->
+          atom.notifications.addSuccess "Merge Complete",
+            detail: detail,
+            dismissable: true
+
+  finish: (andThen) ->
     m.cleanup() for m in @markers
     @markers = []
 

MergeState = require './merge-state'
ResolverView = require './resolver-view'
ConflictMarker = require './conflict-marker'
{SuccessView, MaybeLaterView, NothingToMergeView} = require './message-views'
handleErr = require './error-view'

class MergeConflictsView extends View


  quit: ->
    @pkg.didQuitConflictResolution()

    detail = "Careful, you've still got conflict markers left!\n"
    if @state.isRebase
      detail += '"git rebase --abort"'
    else
      detail += '"git merge --abort"'
    detail += " if you just want to give up on this one."

    @finish ->
      atom.notifications.addWarning "Maybe Later",
        detail: detail
        dismissable: true

  refresh: ->
    @state.reread (err, state) =>
