How to face the conflicts during merge and publishing our application?

Hi, 

I am new to outsystems. I face difficulties while merge and publishing my application when working in team on the same screen. How to face those conflicts during merge ?

Koushik Prathi wrote:

Hi Mounika,

go through this link https://success.outsystems.com/Documentation/11/Developing_an_Application/Merge_the_Work/Compare_and_merge_example_with_conflicts

Regards,

Koushik

Hi Koushik Prathi

If it was css or any logic we can merge it but if it we make any changes in the screen can able to merge.

Regards,

Mounika