Question 130545 in Xcode Question posted in
Whether you're new to Xcode or an experienced developer, our archive has everything you need to know about this integrated development environment (IDE). From basic functionalities to advanced features, our archive covers a wide range of Xcode-related questions and answers. Browse our archive now and find solutions to your Xcode questions, and take your app development skills to the next level

Xcode merge conflict – how to select "all right" for all the conflicts?

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?

Tags:

2

Answers


  1. 0

    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

    Login or Signup to reply.
  2. 0

    Simply do the following:

    download Kintsugi (https://github.com/Lightricks/Kintsugi)

    gem install kintsugi
kintsugi install-driver

    This will resolve 98% of conflicts automatically in your project files!

    Login or Signup to reply.
Please signup or login to give your own answer.

Back To Top
Search