Project conflicts on merge

Hi to all,

I have a problem and I would like to ear from you your experience, if applies. I user SVN as repository and working with others, sometime it happens that merge con project.pbxproj has conflicts.
In this case, AppCode limits itself to reopen project (as usual after an update), and it encounters a parsing error. Now project is "broken" and only thing you can do is go for a manual merge (using an external editor).

After merge is fixed, I delete revision temporary file and .mine file. Nevertheless AppCode gives me a conflict and usually i resolve this problem deleting .idea folder and setting up again my preferences.

If you had ever a problem like this, did you find a way to workaround the problem?

Thank you for your time.

giampaolo

1 comment

After doing manual merge in external editor and opening again on AppCode you can right click to top-level element (project name) in Project tree on the left. Click on Subversion->Mark Resolved...  It should do the trick. But sometimes it takes couple of seconds before you can commit your changes without AppCode thinking it is still conflicted.

0

Please sign in to leave a comment.