Tortoise git
Posted: Sat Apr 26, 2014 2:55 pm
Alright I just went to update and pulled and had a bunch of conflicts and yet i never modified the cpp files so any comments or how to do this would help. Ill post the picture of what happens when i pulled.
