Tortoise git

Forum rules
NO LONGER BEING MAINTAINED!
Post Reply
Vargas
Posts: 54
Joined: Fri Jul 27, 2012 10:25 pm

Tortoise git

Post by Vargas » 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.

Image
Top
User avatar
tagban
Posts: 352
Joined: Fri Dec 28, 2012 11:31 am
Location: Pennsylvania, USA

Re: Tortoise git

Post by tagban » Sat Apr 26, 2014 9:07 pm

Do Stash Save -> Then Pull, then "Stash Pop"
Top
Post Reply

Return to “Bugs”