<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/xhtml; charset=utf-8"> </head> <body> <div style="font-family:sans-serif"><div style="white-space:normal"> <p dir="auto">On 22 Aug 2016, at 18:50, Jack Royal-Gordon wrote:</p> <p dir="auto"></p></div> <div style="white-space:pre-wrap"><blockquote style="border-left:2px solid #777; color:#777; margin:0 0 5px; padding-left:5px"><blockquote style="border-left:2px solid #777; color:#999; margin:0 0 5px; padding-left:5px; border-left-color:#999"><div dir="auto">Right, so your issue is limited to files with local changes which you then change on disk, correct? </div><div dir="auto"> </div><div dir="auto">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. </div><div dir="auto"> </div><div dir="auto">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. </div></blockquote></blockquote></div> <div style="white-space:normal"> <p dir="auto">Turns out I was wrong here, I thought I had disabled this, but I did not.</p> <p dir="auto">So if the file is changed on disk, TextMate should <strong>always</strong> do something about it.</p> <p dir="auto">For unmodified document: Reload changes.</p> <p dir="auto">For modified document: Merge changes, potentially inserting markers for merge conflicts.</p> </div> </div> </body> </html>