Discussions
Categories
Groups
Documentation
Knowledge base
Developer portal
App catalog
The Hub
GitHub
Home
Newly Imported
Restricted
ZF
Diff&Merge: 3-way merge failing for FTA diagram
medini_1036016653
Dear support, starting from (mine) and theirs and yields This obviously went horribly wrong. Can this be caused by using an improper "baseline/ancestor"? (As discussed before, currently it is the user's responsibility to choose a valid baseline. Nonetheless, such a messed up graph should never result from a diff&merge operation.) On the other hand classical two-way merging is able to handle this specific scenario as expected: Please advise. This issue was observed using medini v2019 R1.1. Best regards Peter
Find more posts tagged with
medini
medini legacy
Accepted answers
All comments
medini_1024120963
Hi Peter, did you selected all and arranged them all after the merge? Which merge operation did you do? Merge subtree changes or merge changes? May be a diagramm bug, only. In general it seems to take theirs. Was this your intention?
medini_1036016653
Hi Joel, I instructed to merge subtree changes. The result should be like shown in "theirs" (second screenshot). Best regards Peter
medini_1024120963
Hi Peter, I assume it didn't work with the arrangement, right? BR Joël
medini_1036016653
Hi Joel, not, it was not only a visual glitch, but there really multiple connections between nodes. This in the meanwhile happened more than once. Best regards Peter
medini_1036016653
We still regularly experience our models to get corrupted with errors that can be discovered using the "-debug" startup flag and "Diagnose" -> "Do sanity check". I haven't been successful (and also not trying hard) to get to the bottom of this. My impression is that this happens from diff&merge. Possibly FTA events with scripted probability are involved, but that is not proven.
Quick Links
All Categories
Recent Posts
Activity
Unanswered
Groups
Help
Best Of
