Handling External File Changes

Jonathan Stanton 9 lat temu Ostatnio zmodyfikowane przez Collin Donahue-Oponski 9 lat temu 1
Right now if an external programs edits the file you are currently working on, with sublime text and then if you loose focus to the window and then gain focus it prompts you with 
"Has changed on disk.
Do you want to reload it?"

So my choice is to either, 
1) loose all of my changes
2) loose all of the other persons changes (assuming I save and overwrite their changes)

It would be great if you could have merge control accept / decline changes etc.. or at very least open the changed file in a new unsaved window so I can evaluate for myself the diff.
This would be SO helpful.  I would love to see a diff of the two versions.  Or even just put the two files side-by-side, where one is a temporary buffer and the other is the actual file so that I can manually merge.