When I try to commit the SVN, it shows a conflict with the image files, but I don't see any conflicts when I check locally. How can I resolve this?

25 views Asked by At

My project is an iOS project. When I commit the code to SVN, I see a 'D' next to my image files, indicating deletion. However, when I try to commit the code, a conflict message pops up for the image folder, even though I don't see any conflicts locally. Why is this happening? I am using CornerStone software. Here is popView

0

There are 0 answers