Merge branch 'master' of github.com:github/atom

spec/app/editor-spec.coffee

@@ -252,20 +252,20 @@ describe "Editor", ->
         path = "/tmp/atom-changed-file.txt"
         fs.write(path, "")
         editSession = project.buildEditSessionForPath(path)
+        editor.edit editSession
         editSession.insertText("a buffer change")
 
-        fileChangeHandler = jasmine.createSpy('fileChange')
-        editSession.buffer.file.on 'contents-change', fileChangeHandler
+        bufferContentsChangeHandler = jasmine.createSpy('fileChange')
+        editSession.on 'buffer-contents-change-on-disk', bufferContentsChangeHandler
 
         spyOn($native, "alert")
 
         fs.write(path, "a file change")
 
         waitsFor "file to trigger contents-change event", ->
-          fileChangeHandler.callCount > 0
+          bufferContentsChangeHandler.callCount > 0
 
         runs ->
-          editor.edit(editSession)
           expect($native.alert).toHaveBeenCalled()
 
     describe ".loadNextEditSession()", ->

src/app/editor.coffee

@@ -386,9 +386,6 @@ class Editor extends View
 
     @activeEditSession = @editSessions[index]
 
-    if @activeEditSession.buffer.isInConflict()
-      @showBufferConflictAlert(@activeEditSession)
-
     @activeEditSession.on "buffer-contents-change-on-disk", =>
       @showBufferConflictAlert(@activeEditSession)
 
@@ -398,6 +395,9 @@ class Editor extends View
     @trigger 'editor-path-change'
     @renderWhenAttached()
 
+    if @attached and @activeEditSession.buffer.isInConflict()
+      @showBufferConflictAlert(@activeEditSession)
+
   showBufferConflictAlert: (editSession) ->
     message = editSession.getPath()
     detailedMessage = "Has changed on disk. Do you want to reload it?"