mergepbx

We have hosted the application mergepbx in order to run this application in our online workstations with Wine or directly.

Quick description about mergepbx:

Tracking a Xcode project in a version control system is annoying. Simply adding files can lead to merge conflicts that have to be solved manually, although it would be possible to resolve the conflict automatically if the merge algorithm would be aware of the structure of Xcode's project file. After long and annoying merge sessions in one of my projects, I came to the conclusion, that writing a merge driver for git which understands the structure of the project file would be a worthwhile endeavour, as it would save me from solving the merge conflicts for my co-workers. Unfortunately, that script was finished only after the project ended. However, as I didn't want to let the work go to waste, this script is now published as open source under the GNU GPL 3. This script needs knowledge about the structure of Xcode's project. However, there doesn't seem to be any documentation (and I would be surprised if there were any).

Features:

• To use this script, you have to configure it as a merge driver for you project file
• Use mergepbx as merge tool
• Add mergepbx as a merge tool
• Use mergepbx as a merge driver
• Merge project files
• A tool for merging Xcode project files in git

Programming Language: Python.
Categories: