When you and other developers plan
your work and change different elements in the same module, the OutSystems
Platform automatically merges all the work for you.
The image above illustrates a situation
for an automatic merge:
- The other developer opens version 4 of the module in his development
environment. He starts developing;
- You open version 4 of the module in your development environment.
You start developing;
- The other developer publishes
- You publish your changes:
- The OutSystems Platform determines that there are changes to
be merged, based on the version from where both started developing
- The Modified Version Detected window is displayed and you choose
Merge and Publish;
- The OutSystems Platform automatically merges and publishes
all the work for you.
As an example,
imagine a Contacts application with two developers working on it: Matt
Jones and John Baker.
- One entity for contacts;
- A screen to list contacts and another with contact details;
- One entity for companies.
has to do the following:
- Matt's job is to work on the usability of the contact screens;
- John has to add a screen to list companies and another for company
Each one opens
the module locally in his development environment and starts working:
- Matt publishes his usability changes first.
- When John publishes his changes the Modified
Version Detected window is displayed to him. It informs John
that Matt Jones has already published a changed version of the module.
- John clicks on Merge and Publish
button, and the Platform automatically merges and publishes all the
work for him, because they have been working on different elements
of the module.
About Working in Teams | Resolve Conflicts | Compare