Question

resolving conflicts in v3.0

2

Hi, I'm trying to resolve a couple of conflicts, and have looked through documentation on what to do, and how, but I don't sem to see the same buttons as displayed on the help documentation. I cannot see the "use mine" / "use theirs" buttons on the changes window, and even the task menu in that same window, I can see similar buttons, but they are always shaded, I can never select any of them. Is there some kind of a procedure I am missing to get to update these. All I have done was Updated from Team menu and hoped to resolve the conflicts in the changes window. LR.

asked 2011-10-11

Luis Rodrigues (hotmail)

2 answers

Benny van Reeven · Answer 1 · 2011-10-11

If your project contains conflicts after updating from the Team Server, these conflicts will be listed in the 'Changes' dock. This dock contains one row for each project-level item (project, module, folder or document) that is changed or conflicted locally.

If you select a row that is about a conflict, you should be able to select the 'Resolve using my/their document' items in the 'Tasks' drop-down menu of the 'Changes' dock. You can only select these items when you are at the project level of the dock, not when you're looking at the details of the changes in a document. In other words, the dock should indicate that the location is 'Project'.

Chris de Gelder · Answer 2 · 2011-10-11

Mendix 3.0 is still RC1 and not perfect. File an issue in the support site and describe the followed scenario as precise as possible.