Skip to main content

Developing an Application

 

OutSystems

Compare and merge example

Imagine you are trying to publish your module, but a window "Modified version detected" shows up. It tells you that you need to decide about changes. You select Merge and publish to try the automatic merge, but there are conflicting changes in the local version of the module and the version on the server. You are presented with Compare and Merge window:

After analyzing the information you understand:

  • The other developer added the screen "Chapter Two" and there are no conflicts there. You only worked on "Chapter One". No work needed here on your side.
  • You both edited the preparation screen and the CSS. You now need to resolve the conflicting changes.

This could be the instructions to resolve the conflicts.

  1. Double-click the element "Style Sheet". The Compare and Merge - Style Sheet opens. The tab Merged version (1 conflict) indicates the number of conflicts.

  2. Select which part of the CSS code goes into the resulting local module that will be published. For example, click the orange arrow to replace color: red; with color: pink;. Merged version (1 conflict) changes to Merged version.

  3. Click the go back button in the upper right corner to return to Compare and Merge.

  4. Double-click "Preparation" to open the Compare and Merge - Preparation window. You can see that the SectionID assign element has different values.

  5. Click on the value viewer to open Compare and Merge - Value window.

  6. Click the check box in the Merged version (1 conflict) pane to select the value from your version of the module. Merged version (1 conflict) changes to Merged version.

  7. Click the go back button in the upper right corner to return to Compare and Merge - Preparation window.

  8. Finally, click the go back button in the upper right corner again to return to main Compare and Merge window.

  9. Click Merge and publish to update the local version of the module and publish it. Your local module is updated with the changes, which you can then publish.

  • Was this article helpful?