2

I use Xcode 9.2 for source control, but when there's a conflict after update, I can't resolve them. The usual two-pane screen appears, but instead of showing the conflicts, I only see the following labels:

  • No Files
  • No Selection
  • No Version Editor

So instead of the good graphical interface, I have to use the command line to resolve my conflicts. What's wrong?

Note: when committing, the version editor appears correctly.

enter image description here

rmaddy
  • 314,917
  • 42
  • 532
  • 579
Display Name
  • 4,502
  • 2
  • 47
  • 63
  • I am facing the same issue ? I think the default merge tool FileMerger is not get invoke in case of SVN ? do you have solution.? – Anupam Gupta Mar 28 '18 at 14:11
  • No, I use command line update in case of conflict. However I always try with XCode first, it resolves most conflicts in XML files. (Storyboards, project files.) – Display Name Mar 28 '18 at 18:13
  • I read somewhere saying that there may be some compatibility issue with client svn and server svn, so i tried to update the svn but it did not help me out. – Anupam Gupta May 01 '18 at 20:48

0 Answers0