[TxMt] Re: >>>External Changes deleting parts of file

[Koen Punt]

Sounds like an 'git stash apply' happened.

On 4 jan. 2013, at 01:24, Greg <web at web.knobby.ws> wrote:

> 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. 
> 
> Any ideas? 
>  
> Greg
> 
> _______________________________________________
> textmate mailing list
> textmate at lists.macromates.com
> http://lists.macromates.com/listinfo/textmate

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macromates.com/textmate/attachments/20130104/eea3f703/attachment.html>