[TxMt] Re: >>>External Changes deleting parts of file
koen at koenpunt.nl
Fri Jan 4 17:26:09 UTC 2013
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?
> textmate mailing list
> textmate at lists.macromates.com
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the textmate