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

[Greg]

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macromates.com/textmate/attachments/20130103/70867b6f/attachment.html>