I just going through Xcode’s built-in merge feature. And also using Xcode to resolve git conflicts. It’s my first time. I don’t mean FileMerge. I mean Xcode itself. The only thing is, when it comes to resolving conflicts for pbxproj file, I don’t want to go through selecting 200 conflicts and hit ‘Choose right’ 200 times. I tried copy/pasting from right over to left, but the 'merge' button didn't become green. Is there another way to just select the right file (from main branch) entirely with some other Xcode operation? 

Example for google.com as an item name, I have two keychain items with the name "Foo", one in KeychainA another in keychainB. When I run the following which password should be retrieved? Password from KeychainA or KeychainB? Does it retrieve items from keychains by prioritizing retrieval from 'default' keychain first? Or it's sorted by the keychain name? or it prioritizes items based on date? security find-generic-password -w -s 'google.com' -a 'Foo' I asked because we often have certs that are duplicated across keychains and when I run the command above, the item is retrieved from a locked keychain. Which causes an OS prompt and that halts our Jenkins/CI.