[TxMt] Re: textmate Digest, Vol 99, Issue 26
mailinglist at textmate.org
Mon Aug 29 07:21:23 UTC 2016
On 22 Aug 2016, at 18:50, Jack Royal-Gordon wrote:
>> 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.
Turns out I was wrong here, I thought I had disabled this, but I did
So if the file is changed on disk, TextMate should **always** do
something about it.
For unmodified document: Reload changes.
For modified document: Merge changes, potentially inserting markers for
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the textmate