marcinolawski / storyboardmerge Goto Github PK
View Code? Open in Web Editor NEWXcode storyboards diff and merge tool.
License: GNU General Public License v3.0
storyboardmerge's People
Contributors
Stargazers
Watchers
Forkers
edelabar rmzr7 daniel-lu jjordani seifscape dwighteverhart astanton hezi wesmatlock harriswan9a bgarelli ladegeraet vhristoskov vishalbumpy mspviraj tatowilson abdul-rehman extendas lightning51b arollickstoryboardmerge's Issues
XPathException: Too many rows
When running the project, I get the following error:
2015-10-30 07:50:31.608 StoryboardMerge[3096:185407] Too many rows
2015-10-30 07:50:31.610 StoryboardMerge[3096:185407] (
0 CoreFoundation 0x00007fff8554be32 __exceptionPreprocess + 178
1 libobjc.A.dylib 0x00007fff8a5364fa objc_exception_throw + 48
2 CoreFoundation 0x00007fff855b265d +[NSException raise:format:] + 205
3 StoryboardMerge 0x0000000100008962 -[MOXElement findCousin:] + 562
4 StoryboardMerge 0x0000000100008bc1 -[MOXElement findCousinAndCompare:] + 97
5 StoryboardMerge 0x0000000100008e9e -[MOXElement findCousinAndCompare:] + 830
6 StoryboardMerge 0x0000000100008e9e -[MOXElement findCousinAndCompare:] + 830
7 StoryboardMerge 0x0000000100004a2d -[MOXStoryboard compareStoryboards:] + 333
8 StoryboardMerge 0x000000010000b9e2 -[DocumentsWinCtrl _loadStorybords] + 146
9 StoryboardMerge 0x000000010000c739 -[DocumentsWinCtrl windowDidLoad] + 73
10 AppKit 0x00007fff94fa2607 -[NSWindowController _windowDidLoad] + 592
11 AppKit 0x00007fff94f3f48e -[NSWindowController window] + 110
12 AppKit 0x00007fff9512f5cd -[NSWindowController showWindow:] + 36
13 StoryboardMerge 0x0000000100002bee -[AppDelegate openButtonPressed:] + 1054
14 libsystem_trace.dylib 0x00007fff8f9c4082 _os_activity_initiate + 75
15 AppKit 0x00007fff95198811 -[NSApplication sendAction:to:from:] + 460
16 AppKit 0x00007fff951aaa0e -[NSControl sendAction:to:] + 86
17 AppKit 0x00007fff951aa938 __26-[NSCell _sendActionFrom:]_block_invoke + 131
18 libsystem_trace.dylib 0x00007fff8f9c4082 _os_activity_initiate + 75
19 AppKit 0x00007fff951aa895 -[NSCell _sendActionFrom:] + 144
20 libsystem_trace.dylib 0x00007fff8f9c4082 _os_activity_initiate + 75
21 AppKit 0x00007fff951a8eba -[NSCell trackMouse:inRect:ofView:untilMouseUp:] + 2693
22 AppKit 0x00007fff951f1b78 -[NSButtonCell trackMouse:inRect:ofView:untilMouseUp:] + 744
23 AppKit 0x00007fff951a75e4 -[NSControl mouseDown:] + 669
24 AppKit 0x00007fff956f542d -[NSWindow _handleMouseDownEvent:isDelayedEvent:] + 6322
25 AppKit 0x00007fff956f6411 -[NSWindow _reallySendEvent:isDelayedEvent:] + 212
26 AppKit 0x00007fff9513bb8d -[NSWindow sendEvent:] + 517
27 AppKit 0x00007fff950bbb27 -[NSApplication sendEvent:] + 2540
28 AppKit 0x00007fff94f22d9a -[NSApplication run] + 796
29 AppKit 0x00007fff94eebfbe NSApplicationMain + 1176
30 StoryboardMerge 0x00000001000012c2 main + 34
31 libdyld.dylib 0x00007fff93fd15ad start + 1
)
I can see that it is crashing on the xpath document/dependencies/capability, which indeed have multiple entries:
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
git mergetool -t storyboard asks for left and right hand side files to be selected
After setting up everything, storyboard-merge is opening, but asks for the left and the right hand side file explicitly. This is not the correct behavior.
It should be automatically be taking up the left and right hand side versions based on the merge conflicts, right !
Adding support for xcode 6.4?
Hi,
Just tried your tool with xcode 6.4 storyboard and got a crash (findcousin complains that it found more than one cousin for inside ). Are you working on an update?
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.