[TxMt] Re: textmate Digest, Vol 99, Issue 24

[Allan Odgaard]

On 22 Aug 2016, at 4:52, Jack Royal-Gordon wrote:

> Just discovered another similar occurrence that may add some more 
> data. It appears that when I switch GIT branches, which causes some 
> files in my folder to be changed, TextMate is not reloading the 
> changed files (as it did in Version 1). What I used to get in V1 was 
> that if there were no changes pending on the file when I switched 
> branches, TM would quietly load the new version of the file; if there 
> were changes pending, it would ask if I want to save the current TM 
> copy or overwrite it from the copy on disk. But it seems like it might 
> not be doing this (or at least not doing this consistently) on V2.

Right, so your issue is limited to files with local changes which you 
then change on disk, correct?

In this case TextMate will actually try to merge your local changes with 
the new version on disk, and if it can do this without merge conflicts, 
it updates the file.

But if the merge has conflicts, TM currently does nothing (it logs an 
error to console). Prior to beta 12 it would update the file with the 
merge conflict markers, but I found this behavior undesirable because we 
effectively “mangle” the local changes.

I do however plan to introduce a visual warning for this edge case, but 
unfortunately there was not enough time to get this done for beta 12.