Select code changes that were made inside actions.


When we merge two versions that share an action, we should be able to select inside a action that part of the code we wanted to choose.


V1 has a change in IF and V2 has a change in the same IF but with less things.

I may want to select things from both versions for this IF, and currently this is impossible.

Created on 13 Jul 2018
Comments (7)

This has been suggested before. I totally understand the motivation and agree with it, but I think it is completely unworkable in practice. There are too many ways for conflict resolution to go VERY badly.


While I like the idea, I would say that, in general, this feature is not really necessary.

The rationale is that in an OutSystems project, there is really no reason to 2 developers to work in the same piece of code. This happens very often in open source projects, but that is not the case in OutSystems (typically).

You can argue that sometimes may raise a situation where this will happen for a number of reasons, but adopting good project management practices they will be very rare...

Again, I liked the idea, but I think there are other ideas with more impact we should concentrate first...

Changed the category to Collaboration


Wasn't the implementation of this idea mentioned in the last medium article? (as she said in her example,  the case of an if, where she wanted to keep part of the code from her version and part of the code from the server version)

Filipe -

That's for text stuff like CSS and JavaScript. This idea is for portions of Actions.



with the example she gave, I had the impression she meant to select diferente text versions from the same code.

Completely disagree that the use case of complex merge doesn't occurs using Outsystems...

We have many..many external things in forge that could be incorporated natively and all of this have versioning challenges and many...many times we need to clone as everyone suggests when we give some suggestions of Outsystems to evolve features that professionals need and use all days and is very hard to maintain clones when the original ones are continuously evolving.

If we could select gruops os elements envolving in only positioning changes it will make our live easier.