### Start Git merge tool Source: https://github.com/simonwagner/mergepbx/blob/master/README.md Run this command to manually initiate a merge using the configured mergepbx tool for a specific project file. ```bash git mergetool --tool=mergepbx PROJECT.pbxproj ``` -------------------------------- ### Build mergepbx Executable Source: https://github.com/simonwagner/mergepbx/blob/master/README.md Execute this command in the cloned project directory to build the mergepbx executable. ```bash ./build.py ``` -------------------------------- ### Configure repository for merge driver Source: https://github.com/simonwagner/mergepbx/blob/master/README.md Add this configuration to your .gitattributes file in the repository root to enable automatic mergepbx usage for .pbxproj files. ```gitattributes *.pbxproj merge=mergepbx ``` -------------------------------- ### Configure Git Union Merge Driver Source: https://github.com/simonwagner/mergepbx/blob/master/README.md Add this line to your .gitattributes file to use Git's union merge driver for *.pbxproj files. This approach attempts to combine remote and local file lines. ```gitattributes *.pbxproj merge=union ``` -------------------------------- ### Configure Git merge tool Source: https://github.com/simonwagner/mergepbx/blob/master/README.md Add this configuration to your ~/.gitconfig file to register mergepbx as a custom Git merge tool. ```gitconfig #driver for merging Xcode project files [mergetool "mergepbx"] cmd = mergepbx "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED" ``` -------------------------------- ### Configure Git merge driver Source: https://github.com/simonwagner/mergepbx/blob/master/README.md Add this configuration to your ~/.gitconfig file to define mergepbx as a custom Git merge driver. ```gitconfig #driver for merging Xcode project files [merge "mergepbx"] name = Xcode project files merger driver = mergepbx %O %A %B ``` === COMPLETE CONTENT === This response contains all available snippets from this library. No additional content exists. Do not make further requests.