Comments (4)
Could you try the latest version from master? Commit 2d4ecad might fix your problem, as before mergepbx did import a local ANTLR installation instead of using the built-in ANTLR.
from mergepbx.
It didn't work out of the box. However after downloading and installing antlr from http://www.antlr3.org/ on my system it worked.
from mergepbx.
I did not work perfectly. I have Python 2.7.8 installed from MacPorts and ANTLR 3.1.3 from the antlr website. I got the following error when merging.
Traceback (most recent call last):
File "<stdin>", line 6, in <module>
File "/Users/kasper/mergepbx/mergepbx.py", line 67, in main
File "/Users/kasper/mergepbx/plist/antlr/runtime/antlr3/exceptions.py", line 317, in __str__
File "/Users/kasper/mergepbx/plist/antlr/runtime/antlr3/exceptions.py", line 184, in getUnexpectedType
AttributeError: 'NoneType' object has no attribute 'type'
from mergepbx.
Hm, the good news is, this is another issue - my fix has solved the import problem. The new exception looks like a parsing error.
Please open a new issue for this.
If possible please attach your project files that you are trying to merge to that issue (if you are allowed to share it). You can get the files by adding the --dump /tmp/mergedump.zip
option to the mergepbx configuration in ~/.gitconfig
and then doing the merge again. Upload /tmp/mergedump.zip
then somewhere (e.g. on gist) and attach the link to it to the issue.
If you can't share your project files publicly, I can give you my email address.
from mergepbx.
Related Issues (20)
- Crash on project files with source name of (null) HOT 3
- merging failed: strategy not found: PBXHeadersBuildPhaseMerger3 HOT 2
- merged works but left a bunch of deleted files still in the xcodeproj groups
- Merging fails with: merging failed: u'PBXAggregateTarget' HOT 10
- Merges by just removing files
- Merge fails on "currentVersion" HOT 1
- about cocoaPods HOT 1
- mergepbx cannot handle paths with whitespace HOT 2
- merging failed: 'fileRef' HOT 2
- Merge Conflicts in Branches are not made visible HOT 5
- Xcode 8.1 crashes when mergepbx resolves conflicts
- Add "pbxproj" to the topics of the project :) HOT 2
- merge same file_reference
- mergepbx crash on currentVersion conflict HOT 2
- merging failed: can not merge projects with objectVersion 47 HOT 5
- 3-way merge fallback marks a file as resolved, even if there are still merge conflicts
- Unknown merge tool after installing with brew HOT 1
- merging failed: can not merge projects with objectVersion 50 HOT 7
- merging failed: Unknown entry in project file: XCRemoteSwiftPackageReference
- Mergepbx doesn't work on macOS 12.3
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from mergepbx.