Second, when applying all remaining non-conflicting changes from right to left, these changes do show up as merged in the Compare View, but don't show up in the beforementioned XML representation.
I guess it's a bug, since the problem does not occur when I pick the changes one-by-one (which is our current workaround). Third, I find it quite confusing that the tooltip on the 'Apply all from Right to Left' Icon mentions that it will apply all changes, whereas the Action in the contextmenu mentions that it will only apply Non-conflicting Changes, but uses the same Icon. I'm guessing it is actually the same action, but I'm not sure. If there is a way of easily fixing some of the issues, I would gladly do so. Thanks for providing feedback! It is great that you are taking the time to help improving EMF Compare. Quote: First, there is the problem that the save button does not work. As far as I understand what can be found on this forum and on the wiki, this might have something to do with EGit not handling that action correctly. It should know that the left representation of the model actually corresponds to the file in the workspace and should be saved there.
The problem seems to be complicated though, beacause models can span multiple files. How did you start the conflict resolution? To me it sounds like you are not using the intended workflow of resolving conflicts, since what you describe more sounds like a comparison and not like the Model Merge tool.
0 kommentar(er)
