I've seen the same thing happen to me when I edited a file I had open in TM2 in another editing program.  Maybe you have another program or process running that is modifying the file?<div><br></div><div>Mike<br><br><div class="gmail_quote">
On Fri, Jan 4, 2013 at 1:37 PM, Greg <span dir="ltr"><<a href="mailto:web@web.knobby.ws" target="_blank">web@web.knobby.ws</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div style="word-wrap:break-word">Thanks. I'm not using git with TextMate and there's no shortcut for it, so seems unlikely.<div><br></div><div>I assume I'm inadvertently applying some shortcut. More than irritating since the end of the file gets chopped off without my realizing it and I'm relying on manual saving. </div>
<div><span class="HOEnZb"><font color="#888888"><div>
<span style="text-indent:0px;letter-spacing:normal;font-variant:normal;text-align:-webkit-auto;font-style:normal;font-weight:normal;line-height:normal;border-collapse:separate;text-transform:none;font-size:medium;white-space:normal;font-family:Helvetica;word-spacing:0px"><span style="text-indent:0px;letter-spacing:normal;font-variant:normal;text-align:-webkit-auto;font-style:normal;font-weight:normal;line-height:normal;border-collapse:separate;text-transform:none;font-size:medium;white-space:normal;font-family:Helvetica;word-spacing:0px"><div style="word-wrap:break-word">
<div style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0px;font-size:12px"><font color="#0000FE"><font face="Verdana"> </font></font></div><div style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0px;font-family:Helvetica;font-size:12px">
<font color="#0000FE">Greg</font></div></div></span></span>
</div></font></span><div class="im">
<br><div><div>On Jan 4, 2013, at 9:26 AM, Koen Punt <<a href="mailto:koen@koenpunt.nl" target="_blank">koen@koenpunt.nl</a>> wrote:</div><br><blockquote type="cite"><div style="word-wrap:break-word">Sounds like an 'git stash apply' happened.<br>

<br><div><div>On 4 jan. 2013, at 01:24, Greg <<a href="mailto:web@web.knobby.ws" target="_blank">web@web.knobby.ws</a>> wrote:</div><br><blockquote type="cite"><div style="word-wrap:break-word">I'm working on a Ruby script in TextMate 2 and all of a sudden I'm seeing the end of my files disappear and inserted midline is ">>>>>>> External Changes" and from there on everything is deleted. The only thing that I've knowingly changed is I've started to use Bookmarks. Therefore Cmd-F2 and shift-F2. <div>
<br></div><div>Any ideas? <div><span style="border-collapse:separate;font-family:Helvetica;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;border-spacing:0px;font-size:medium"><span style="border-collapse:separate;border-spacing:0px;font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><div style="word-wrap:break-word">
<span style="border-collapse:separate;border-spacing:0px;font-family:Verdana;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="border-collapse:separate;border-spacing:0px;font-family:Verdana;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="border-collapse:separate;border-spacing:0px;font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="border-collapse:separate;border-spacing:0px;font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><div>

<span style="border-collapse:separate;font-family:Helvetica;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-align:-webkit-auto;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;border-spacing:0px;font-size:medium"><span style="border-collapse:separate;font-family:Helvetica;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-align:-webkit-auto;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;border-spacing:0px;font-size:medium"><div style="word-wrap:break-word">
<div style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0px;font-size:12px"><font color="#0000FE"><font face="Verdana"> </font></font></div><div style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0px;font-family:Helvetica;font-size:12px">
<font color="#0000FE">Greg</font></div></div></span></span></div></span></span></span></span></div></span></span></div></div></div></blockquote></div></div></blockquote></div></div></div></div><br><br>
_______________________________________________<br>
textmate mailing list<br>
<a href="mailto:textmate@lists.macromates.com">textmate@lists.macromates.com</a><br>
<a href="http://lists.macromates.com/listinfo/textmate" target="_blank">http://lists.macromates.com/listinfo/textmate</a><br></blockquote></div><br></div>