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?
Asked
Active
Viewed 43 times
0
-
Have you tried `git mergetool`? Also see [Fix merge conflicts in Git?](http://stackoverflow.com/questions/161813/fix-merge-conflicts-in-git) – agold Nov 23 '15 at 13:45
-
Brilliant. I've resolved it. Thanks a lot. – Leo Nov 23 '15 at 16:22
-
I am writing this answer on behalf of @Caesar. Refer this - [Fix merge conflicts in Git](https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git) – Deepak Terse Mar 04 '18 at 04:29
-
Possible duplicate of [How to resolve merge conflicts in Git?](https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git) – Deepak Terse Mar 04 '18 at 04:33