Xcode merge: How to click "Left then right" button?

Viewed 543

I am trying to merge a branch in Xcode. The .pbxproj file has a lot of differences. Many differences are so far apart that I can't physically click the button because it never appears. Is there a shortcut? Can I merge manually? How is this even an issue, am I doing something wrong?

enter image description here

1 Answers

I found out you can not only use the cursor keys to go up and down between conflicts but also press left/right to select the different merge options.

It's better than nothing but still almost useless because you can't see both sides at the same time.

Related