Geek Answers Handbook

In changing edit-buffer when changing file

Many editors will notice when a file comes out of them. Is there any editor that will offer you to do a three-way merge if you have unsaved changes to the file?

The general scenario for this is that I forgot to save the file before I updated SVN, and when I return to the editor, I realized that I now have a choice of what I just did, discarding my changes or performing a song / dance with copy / paste / external-diff-instrument and dance.

Yes, I know that the correct solution is ctrl + s before I upgrade, but I am human and I want a very simple solution to fix the problem after I mess it up.

+3
source share
6 answers

EditPad Pro , when it detects that the file that you opened with unsaved changes has changed on the disk, asks if you want to reload the file from disk, ignore the change on disk, or look at the difference between the file on disk and the version with unsaved changes, which you opened.

This is the two-way diff, not the three-way diff that you specified. I do not know a text editor that will offer to make a three-way diff. If the file on the disk was jammed, the text editor no longer has a copy of the original. This would be a problem for version control.

, , . SVN , . EditPad Pro , , .

+2

vim diff : DiffOrig.
: checkt

, .vimrc:

au FileChangedShell * DiffOrig

Vim diff, , (mtime) .

+1

. : ?

+1

, , , , , .

SVN-, . ( ) .

+1

, , SVN , ?

SVN. SVN , .

/ - , SVN- .

+1

-, .

, Emacs , , , . , , .

Vi ( , , ) , . ( , , , . , vi.)

0

More articles:


All Articles