Gitignore merge conflict

0
I want to pull all the changes, but i get this error saying gitignore error, how can i fix this   When i open it in tortoise i get this, but i don't know how to fix it
asked
1 answers
0

Hi Stefan, the best way to solve this is to right click your project and select tortoiseSVN > Resolve

 

image.png

 

If you don't have this you'll have to download tortoiseSVN first.

 

Download tortoiseSVN

answered