Hi Camillo, Is it different from the merge button in MC? #Luc 2011/9/29 Camillo Bruni <camillo.bruni@inria.fr>
Hi everyone,
I am improving the way the Monticello UI handles conflicts when doing a load.
Right now you just get a warning which lets you decide whether to overwrite the local changes or simply cancel the action â a merge action is missing!
I added the marge behavior, so far so good, but there is a slight glitch: The conflict message is shown based on conflicts on the package level, for performance reasons. Lets assume that the loaded version only contains new classes for the package that you changed locally, you still get a conflict message although the changes can be loaded without problems.
So my question is on how to load stuff in this case: - go the git/svn way and load everything if there are no conflicts - load everything if there are only added entities (not removals/modifications) - always show the merge/diff view to check what changed manually
cami