Im trying to pull master data changes to my current branch in Xcode. But there is a json file difference which I am not able to resolve and Xcode has no options to select left or right during json file comparison.
How to resolve the conflict and pull the data in Xcode or how to use bitbucket command line to resolve pull conflict.
