3 ms·
It would make me happy if SublimeGit was better at showing merge conflicts. I feel like I only know they exist when I'm surprised that my build is now broken,
by bsimpson 12y ago
It would make me happy if SublimeGit was better at showing merge conflicts. I feel like I only know they exist when I'm surprised that my build is now broken, and my only resolution is to Find in Project for `>>>>>` and hope I catch all of them.
- pc86 12y agoI've never used SublimeGit (or heard of it before today, to be honest), but if that's how you fix merge conflicts it sounds like a broken product.
- jbrooksuk 12y agoIt'd make me happy if SublimeGit fixed the pull issues on OSX, let alone any update :(
- mynameisvlad 12y agogit status will tell you which files are conflicted.