Report question

Question: How to resolve git pull conflicts in xcode ui