while merging 2 branches I encountered 1452 conflicts in the project.pbxproj file.

I want to "choose right" for all these conflicts, is there a way to do that once for all or I have to manually select choose right for 1452 times?

CodePudding user response：

git checkout --theirs . in the command line (Terminal app)

either this or git checkout --ours . depending if you want what you had on the branch (ours) or what you just pulled (theirs)

I don't believe Xcode has that