Can't mark conflict as resolved
By sergey.iva...@enkigames.com on November 16, 2011 12:29 (imported from Google Code)
Repro steps:
- Pull data from different branch and became lot of conflicts (about 150)
- Edit conflict and try to mark it as resolved
In some cases this error occurs http://gyazo.com/7e13a1edfb3c76208b91cf6d4000861d
I'm using
TortoiseGit-1.7.5.0-64bit
Git-1.7.4-preview20110204
Win 7
Some conflicts are resolving fine and I can't understand what does it depend
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information