I just pulled from remote repo to my local repo and .pbxproj merge conflict happens. However when I opened it I didn't find any git marks( which means <<< === >>> ) so I don't know how to resolve this conflict. Any idea?
I just pulled from remote repo to my local repo and .pbxproj merge conflict happens. However when I opened it I didn't find any git marks( which means <<< === >>> ) so I don't know how to resolve this conflict. Any idea?