4 Jan
2013
4 Jan
'13
5:26 p.m.
Sounds like an 'git stash apply' happened.
On 4 jan. 2013, at 01:24, Greg web@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@lists.macromates.com http://lists.macromates.com/listinfo/textmate