how to resolve .pbxproj merge conflict using Atom?

Question

If merge conflict is detected in .pbxproj file, which sign means the conflicted source? enter image description here

which of these signs should i delete here?

Answer 1

Excerpt taken from this link

Think of these new lines as "conflict dividers". The ======= line is the "center" of the conflict. All the content between the center and the <<<<<<< HEAD line is content that exists in the current branch master which the HEAD ref is pointing to. Alternatively all content between the center and >>>>>>> new_branch_to_merge_later is content that is present in our merging branch.

I would suggest you to use some mergetool which will make your life easier. Here is the link for it

Or on terminal just run the command git mergetool it will open the diff and chose right or left or both. Here is tutorial for it