mergepbx - script for merging XCode project files in git

  •        123

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.

https://github.com/simonwagner/mergepbx

Tags
Implementation
License
Platform

   




Related Projects

pbxprojHelper - A macOS tool help you handling project.pbxproj files. Written in Swift 4!

  •    Swift

pbxprojHelper is a GUI tool developed with Cocoa and Swift 4 for parsing and changing Xcode projects configuration. You can also use pbxproj as a command line tool in terminal. You can clone the source code of pbxprojHelper, then compile and run it by Xcode.

Kin - Simple PBXProj Verifier

  •    Python

Kin is a minimalistic tool to check whether your project.pbxproj file is correct. Have you ever found yourself undoing a merge due to a broken Xcode build? Then Kin is your tool. It will parse your project configuration file and detect errors.

GitDiff - Highlights deltas against git repo in Xcode

  •    Objective-C

To use, clone this project and build target "LNXcodeSupport". You'll need to unsign your Xcode binary for the Xcode side of the plugin to load. The user interface is largely as it was before. Lines that have been changed relative to the repo are highlighted in amber and new lines highlighted in blue. Code lint suggestions are highlighted in dark blue and lines with a recent commit to the repo (the last 7 days by default) are highlighted in light green, fading with time.

ShowInGitHub - Xcode plugin to open the GitHub page of the commit of the currently selected line in the editor window

  •    Objective-C

Xcode plugin to open a related Github or BitBucket page directly from the Xcode editor code window. Installs easily through the Xcode package manager Alcatraz. Show in GitHub has been tested with Xcode 5.1.1.

OFXcodeMenu - OpenFrameworks plugin for Xcode, adds addons to your project

  •    Objective-C

OpenFrameworks plugin for Xcode that adds addons to your project. Compatible with Xcode 5 - 7 on OS X 10.8+. HEAD of this repo is typically paired with the latest Xcode. For older Xcode releases, see the git tags or just checkout OFXcodeMenu at the relevant point in time. You may need to create a few of the directories on the way, as they don't all exist by default.


git-aware-prompt - Display current Git branch name in your terminal prompt when in a Git working directory

  •    Shell

Working with Git and its great branching/merging features is amazing. Constantly switching branches can be confusing though as you have to run git status to see which branch you're currently on. The solution to this is to have your terminal prompt display the current branch. There's a number of articles available online about how to achieve this. This project is an attempt to make an easy to install/configure solution.

git-imerge - Incremental merge for git

  •    Python

Perform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. I think that it is easiest to understand the concept of incremental merging visually, and therefore I recommend the video of my git-imerge presentation from the GitMerge 2013 conference (20 min) as a good place to start. The full slides for that talk are available in this repository under doc/presentations/GitMerge-2013. At the same conference, I was interviewed about git-imerge by Thomas Ferris Nicolaisen for his GitMinutes Podcast #12.

Xcode-Keyboard-Shortcuts - A Git Repo for storing the Xcode Keyboard Shortcuts as well as being able to keep track of forks

  •    Javascript

This is the official repository for the Xcode Keyboard shortcuts. This repository has the Xcode 4.0 shortcuts. It also makes it easy to track forks so alternative versions are easily discoverable. The document is currently a Pages '09 Document.

nbdime - Tools for diffing and merging of Jupyter notebooks.

  •    Python

nbdime provides tools for diffing and merging of Jupyter Notebooks. See the installation docs for more installation details and development installation instructions.

Git

  •    C

Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

MTStatusBarOverlay - A custom iOS status bar overlay seen in Apps like Reeder, Evernote and Google Mobile App

  •    Objective-C

This project is out of date, I'd advise you to use a more modern alternative out there. MTStatusBarOverlay is compiled as a static library. You have two options for integrating it into you own project, after cloning the MTStatusBarOverlay git repository with the terminal-command: git clone git://github.com/myell0w/MTStatusBarOverlay.git Since MTStatusBarOverlay now uses ARC, you have to add "-fobjc-arc" to "Other Linker Flags" of your project, If you are using Xcode 4.2 or up with the iOS 5.0 SDK on a non-ARC target.

ACCodeSnippetRepositoryPlugin - A plugin for Xcode to synchronize code snippets with repositories

  •    Objective-C

ACCodeSnippetRepositoryPlugin is a Xcode plugin for seemless synchronization of snippets with a git repository. The snippets are synchronized as human-readable text (and not an obscure .codesnippet plist).

SalesforceMobileSDK-iOS - Force.com mobile SDK for iOS applications

  •    Objective-C

Working with this repository requires working with git. Any workflow that leaves you with a functioning git clone of this repository should set you up for success. Downloading the ZIP file from GitHub, on the other hand, is likely to put you at a dead end. This script pulls the submodule dependencies from GitHub, to finalize setup of the workspace. You can then work with the Mobile SDK by opening SalesforceMobileSDK.xcworkspace from Xcode.

VWInstantRun - An Xcode plugin let you build & run your selected lines of code in Xcode without running the whole project, you'll have the output instantly in your Xcode console

  •    Swift

Now with VWInstantRun, you won't run into this situation any more. An Xcode plugin let you build & run your selected lines of code in Xcode without running the whole project, you'll have the output instantly in your Xcode console. Installation: You can clone or just download the project, then open project with Xcode, build and run project, and finally restart Xcode to active plugin.

Decode PeopleCode

  •    Java

Decodes PeopleCode (the proprietary language in Oracle's PeopleSoft ERP software) from bytecode to text. Stores the code in text files, or commits it to a Subversion or Git version control system. Can also extract PeopleCode and SQL text from PeopleTools .xml project files, and does three-way merging of PeopleCode (to reapply customizations during an upgrade).

Fossil

  •    C

Fossil is a distributed version control like Git and Mercurial. Fossil also supports distributed bug tracking and distributed wiki all in a single integrated package. It is simple, high-reliability, distributed software configuration management.

Diffuse

  •    Python

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.

NewLife XCode ??????

  •    DotNet

XCode???????ORM??????????????????????????????????????90%??????????? ??X???????????XCode?????????????????????????????? XCode???“??”??“???”????????????????????XCode????????????????????????????????????????????????????????????????????????XCode????????????????????????...

Dash-Plugin-for-Xcode - Plugin for Xcode to integrate the Dash documentation viewer app

  •    Objective-C

This plugin does not work with Xcode 8 or newer. The new Xcode 8 extensions API is unreliable and extremely lacking. An Xcode 8 extension will not be released as it would not add any functionality that isn't there already. The recommended workaround is to set up a Search using selected text shortcut in Dash's Preferences > General. If you absolutely must use an extension in Xcode 8+, the Xcode Search and xTextHandler extensions support Dash. I don't recommend this, as extensions don't do anything more than what the Search using selected text keyboard shortcut does.

update_xcode_plugins - No more messing with plugin UUIDs; Plugins on Xcode 8+!

  •    Ruby

This tool adds the missing UUIDs into the installed Xcode plugins so that they can be loaded by newer versions of Xcode. You can choose to run it once or install a launch agent that will trigger the tool every time any of your installed plugins are modified or Xcode/Xcode-beta gets updated.






We have large collection of open source products. Follow the tags from Tag Cloud >>


Open source products are scattered around the web. Please provide information about the open source projects you own / you use. Add Projects.