Comments (7)
I get the same problem, but for version 51
from mergepbx.
Are you able to do the merge again? If so, it would be helpful to have a dump of the files that mergepbx
uses as input.
You can dump them by adding --dump /tmp/mergepbx.zip
to the arguments for mergepbx
in your ~/.gitconfig
. This will create a ZIP file under /tmp/mergepbx.zip
from the files that you are trying to merge when you do the merge.
mergepbx
gets three files as input: the file from the current branch, the file from the branch you are merging and the file from the merge base. The merge base is the last common commit of the branches which are merged together.
You need all those three files to determine what the merge result should be.
From your screenshot alone I can't see what caused the error, because it only shows me two files which is not enough to determine why the merge failed.
You could have a legitimate conflict if the merge base had a different file which has been replaced by DataTest.swift
and Data+Extension.swift
.
Example:
The current commit looks like this:
A
B
Now the branch b1
and b2
are created from this commit.
b1
now changes to
A
C
and b2
changes to
A
D
Now what should the result be, if we merge b2
into b1
?
A B C D
or A B D C
? Which order should we take, should the changes from b1
come first or those from b2
?
Or did both b1
and b2
try to replace B
? Then we have to choose which replacement we should take, A D
or A C
?
To answer those questions, you have to ask the user for his actual intent. So a merge has to fail in this case and let the user himself decide what the correct result should be.
from mergepbx.
Hello @simonwagner
Thanks for answering :)
Yes, my example wasn't the best one to explain the issue we're encountering.
I tried again to do a merge with the tool ; i got the issue again. I'm joining the dumped zip.
mergepbx.zip
from mergepbx.
Hello @simonwagner
I have another one to share !
from mergepbx.
@NicolasRiviere Hello, I have the same issue with 51 version. Did you resolve that problem? @simonwagner
from mergepbx.
I have modified SUPPORTED_OBJECT_VERSIONS = set((51,)) in pbxmerge.py and all worked well, thank for the script!
from mergepbx.
I have modified SUPPORTED_OBJECT_VERSIONS = set((51,)) in pbxmerge.py and all worked well, thank for the script!
Thanks! I Will do the same!
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: 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.